Commit 1d85b44a by huluobin

update

parent 10231eea
...@@ -112,18 +112,21 @@ public abstract class AbstractCostService implements CostService { ...@@ -112,18 +112,21 @@ public abstract class AbstractCostService implements CostService {
@Override @Override
public void setPrimaryDepartment(List<CostDomain> costDomains) { public void setPrimaryDepartment(List<CostDomain> costDomains) {
List<OaUser> oaUserList = oaUserMapper.selectBatchIds(costDomains.stream().map(CostDomain::getCreateUserid).collect(Collectors.toList())); List<OaUser> oaUserList = oaUserMapper.selectBatchIds(costDomains.stream().map(CostDomain::getCreateUserid).collect(Collectors.toList()));
Map<Integer, OaDepartment> departmentMap = oaDepartmentMapper.selectBatchIds(oaUserList.stream().map(OaUser::getPrimaryDepartmentId).collect(Collectors.toList())) if (ListUtil.isNotEmpty(oaUserList)) {
.stream() Map<Integer, OaDepartment> departmentMap = oaDepartmentMapper.selectBatchIds(
.collect(Collectors.toMap(OaDepartment::getDepartmentId, oaDepartment -> oaDepartment)); oaUserList.stream().map(OaUser::getPrimaryDepartmentId).collect(Collectors.toList()))
.stream()
Map<Integer, OaUser> oaUserMap = oaUserList.stream() .collect(Collectors.toMap(OaDepartment::getDepartmentId, oaDepartment -> oaDepartment));
.peek(oaUser -> oaUser.setPrimaryDepartment(departmentMap.get(oaUser.getPrimaryDepartmentId()))) Map<Integer, OaUser> oaUserMap = oaUserList.stream()
.collect(Collectors.toMap(OaUser::getOaUserId, oaUser -> oaUser)); .peek(oaUser -> oaUser.setPrimaryDepartment(departmentMap.get(oaUser.getPrimaryDepartmentId())))
.collect(Collectors.toMap(OaUser::getOaUserId, oaUser -> oaUser));
costDomains.forEach(costDomain -> {
costDomain.setPrimaryDepartmentId(oaUserMap.get(costDomain.getCreateUserid()).getPrimaryDepartmentId());
costDomain.setPrimaryDepartmentName(oaUserMap.get(costDomain.getCreateUserid()).getPrimaryDepartment().getName());
});
}
costDomains.forEach(costDomain -> {
costDomain.setPrimaryDepartmentId(oaUserMap.get(costDomain.getCreateUserid()).getPrimaryDepartmentId());
costDomain.setPrimaryDepartmentName(oaUserMap.get(costDomain.getCreateUserid()).getPrimaryDepartment().getName());
});
} }
@Resource @Resource
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment