班组分组查询接口修改

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java

@@ -172,12 +172,14 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 			List<ImsDutyGroupPVO> imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId());
 			if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){
 				List<Long> 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)) {