From b987433fe75ed5cf68947f4d94749e5a174a5f4c Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Thu, 20 Apr 2023 17:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=8A=9F=E8=83=BDbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyGroupServiceImpl.java      | 1 +
 .../hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
index c71d13d..17d4e0b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
@@ -287,6 +287,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 			//根据班组ID获取值班信息
 			List<ImsDutyMainEntity> list1 = iImsDutyMainService.list(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
 				in(ImsDutyMainEntity::getDutyGroupId, collect);
+				in(ImsDutyMainEntity::getStatus,Arrays.asList(0,1));
 			}});
 
 			if (CollectionUtil.isNotEmpty(list1)) {
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 01c3bfa..1ddfc71 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
@@ -776,7 +776,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 			List<ImsSchedulingVo> collect = imsSchedulingVos.stream().filter(o -> DateUtil.format(o.getDutyDate(), DateUtil.PATTERN_DATE).equals(date)).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
 			collect = collect.stream().map(s -> {
 				//灵活排班把班组名称拼接成人员名称
-				if (s.getGroupName() == null) {
+				if (s.getGroupId() == null) {
 					String[] split = s.getDutyPersonIds().split("\\^");
 					if (null != split && split.length > 0) {
 						for (int j = 0; j < split.length; j++) {
@@ -791,8 +791,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 						}
 					}
 				} else {
-//					ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getGroupId());
-					s.setName(s.getName() + s.getGroupName());
+					ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getGroupId());
+					s.setName(s.getName() + imsDutyGroupEntity.getGroupName());
 				}
 				return s;
 			}).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());