From da4cd53cde7d3712aa214f0e456653f1d52327ae Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Mon, 8 May 2023 14:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=81=E5=8F=91=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E7=9A=84=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 1c1efed..bbe5880 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
@@ -148,6 +148,7 @@
     </select>
     <select id="selectByIdOneV2" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo">
         SELECT
+        DM.DUTY_DATE AS dutyDate,
         DM.ID AS id,
         DM.DUTY_GROUP_ID AS groupId,
         DM.CLASS_ID AS classId,
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 1e6e138..bed2691 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
@@ -467,7 +467,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 						if (ObjectUtil.isNotEmpty(split)) {
 							for (String dutyGroupId : split) {
 								//查询班组信息
-								List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(dutyGroupId)));
+								Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
+								List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
 								List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
 								if (CollectionUtil.isNotEmpty(collectPerson)) {
 									personIds = StringUtils.join(collectPerson, "^");
@@ -497,7 +498,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 					String groupName = null;
 					if (imsSchedulingVo.getPersonType() == 1) {
 						//查询班组信息
-						List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(groupId)));
+						Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
+						List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
 						collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
 						if (CollectionUtil.isNotEmpty(collectPerson)) {
 							personIds = StringUtils.join(collectPerson, "^");