|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.epmet.service.user.impl; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.epmet.commons.dynamic.datasource.annotation.DataSource; |
|
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.constant.DataSourceConstant; |
|
|
@ -752,6 +753,7 @@ public class UserServiceImpl implements UserService { |
|
|
|
return; |
|
|
|
} |
|
|
|
List<ScreenProjectDataDTO> collection = userDao.selectScreenProjectData(topicUserIdList); |
|
|
|
logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(collection),topicUserIdList); |
|
|
|
Map<String, ScreenProjectDataDTO> topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1)); |
|
|
|
/* if(!CollectionUtils.isEmpty(collection)){ |
|
|
|
list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId())) |
|
|
@ -766,6 +768,7 @@ public class UserServiceImpl implements UserService { |
|
|
|
return; |
|
|
|
} |
|
|
|
List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList); |
|
|
|
logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList); |
|
|
|
Map<String, ScreenProjectDataDTO> collect = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1)); |
|
|
|
list.forEach(project->{ |
|
|
|
ScreenProjectDataDTO userDTO = collect.get(project.getLinkName()); |
|
|
|