From 9c260834856d235c6ff5a4a79525e3ce03bbecf0 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Fri, 22 Mar 2024 18:14:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=88=86=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/duty/service/impl/ImsDutyGroupServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 ef0e5a0..12efa2e 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 @@ -172,12 +172,14 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId()); if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){ List userIds = imsDutyGroupPVOS.stream() - .map(ImsDutyGroupPVO::getPersonId).filter(s->entity.getManagerId().equals(s)).collect(Collectors.toList()); + .map(ImsDutyGroupPVO::getPersonId).collect(Collectors.toList()); String name=""; for (int i1 = 0; i1 < userIds.size(); i1++) { - name=name+UserCache.getUser(userIds.get(i1)).getName(); - if (i1!= userIds.size()-1){ - name=name+","; + if(ObjectUtil.isNotEmpty(entity.getManagerId())&&!entity.getManagerId().equals(userIds.get(i1))){ + name = name + UserCache.getUser(userIds.get(i1)).getName(); + if (i1 != userIds.size() - 1) { + name = name + ","; + } } } if (StringUtils.isNotBlank(name)) {