From 4de9194c724915ee88c3834cc0518bb514e7f87b Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Mon, 24 Apr 2023 13:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=92=E7=8F=AD-=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BB=93=E6=9E=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml  | 1 -
 .../hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java    | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
index 12f2cc9..b8625fe 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
@@ -361,7 +361,6 @@
         FROM hz_ims_duty_main DM
                  JOIN hz_ims_duty_class DC
                       ON DM.`CLASS_ID` = DC.`ID`
-        WHERE DG.MANAGER_ID IS NOT NULL
           AND DM.ID = #{dutyId}
         order by DM.duty_date desc
             limit 1;
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 295ff91..94f869f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -1033,6 +1033,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 			if (null == s.getGroupId()) {
 				ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
 					eq(ImsDutyMainPersonEntity::getDutyMainId, s.getDutyId());
+					last("limit 1");
 				}});
 				s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson());
 			} else {
@@ -1187,6 +1188,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 			if (null == s.getGroupId()) {
 				ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
 					eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId());
+					last(" limit 1");
 				}});
 				s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
 			} else {
@@ -1382,6 +1384,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		if (null == dutyMainInfoVo.getDutyGroupId()) {
 			ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
 				eq(ImsDutyMainPersonEntity::getDutyMainId, dutyMainInfoVo.getId());
+				last(" LIMIT 1");
 			}});
 			dutyMainInfoVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
 		} else {