|
|
@ -408,7 +408,11 @@ public class ImsDutyGroupServiceImpl extends ServiceImpl<ImsDutyGroupMapper, Ims |
|
|
|
List<DutyMemberVO> members = group.getMember().stream().peek(member->{ |
|
|
|
List<DutyMemberVO> members = group.getMember().stream().peek(member->{ |
|
|
|
User person = UserCache.getUser(member.getPersonId()); |
|
|
|
User person = UserCache.getUser(member.getPersonId()); |
|
|
|
if (ObjectUtil.isNotEmpty(person)) { |
|
|
|
if (ObjectUtil.isNotEmpty(person)) { |
|
|
|
member.setPersonName(person.getName()); |
|
|
|
if(StringUtil.isBlank(person.getRealName())){ |
|
|
|
|
|
|
|
member.setPersonName(person.getName()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
member.setPersonName(person.getRealName()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
group.setMember(members.stream().filter(o->StringUtil.isNotBlank(o.getPersonName())).collect(Collectors.toList())); |
|
|
|
group.setMember(members.stream().filter(o->StringUtil.isNotBlank(o.getPersonName())).collect(Collectors.toList())); |
|
|
|