|
@ -761,7 +761,7 @@ public class UserServiceImpl implements UserService { |
|
|
.map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList()); |
|
|
.map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
Map<String, ScreenProjectDataDTO> staffMap = new HashMap<>(); |
|
|
Map<String, ScreenProjectDataDTO> staffMap = new HashMap<>(); |
|
|
if (!CollectionUtils.isEmpty(topicUserIdList)){ |
|
|
if (!CollectionUtils.isEmpty(staffUserIdList)){ |
|
|
List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList); |
|
|
List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList); |
|
|
logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList); |
|
|
logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList); |
|
|
staffMap = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1)); |
|
|
staffMap = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1)); |
|
@ -773,6 +773,7 @@ public class UserServiceImpl implements UserService { |
|
|
userDTO = topicUserMap.get(project.getLinkName()); |
|
|
userDTO = topicUserMap.get(project.getLinkName()); |
|
|
} |
|
|
} |
|
|
if (userDTO != null) { |
|
|
if (userDTO != null) { |
|
|
|
|
|
logger.info("fillScreenProjectData every user data:{}", JSON.toJSONString(userDTO)); |
|
|
project.setLinkName(userDTO.getLinkName()); |
|
|
project.setLinkName(userDTO.getLinkName()); |
|
|
project.setLinkMobile(userDTO.getLinkMobile()); |
|
|
project.setLinkMobile(userDTO.getLinkMobile()); |
|
|
} |
|
|
} |
|
|