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)) {