Commit 1d85b44a by huluobin

update

parent 10231eea
...@@ -112,10 +112,11 @@ public abstract class AbstractCostService implements CostService { ...@@ -112,10 +112,11 @@ 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)) {
Map<Integer, OaDepartment> departmentMap = oaDepartmentMapper.selectBatchIds(
oaUserList.stream().map(OaUser::getPrimaryDepartmentId).collect(Collectors.toList()))
.stream() .stream()
.collect(Collectors.toMap(OaDepartment::getDepartmentId, oaDepartment -> oaDepartment)); .collect(Collectors.toMap(OaDepartment::getDepartmentId, oaDepartment -> oaDepartment));
Map<Integer, OaUser> oaUserMap = oaUserList.stream() Map<Integer, OaUser> oaUserMap = oaUserList.stream()
.peek(oaUser -> oaUser.setPrimaryDepartment(departmentMap.get(oaUser.getPrimaryDepartmentId()))) .peek(oaUser -> oaUser.setPrimaryDepartment(departmentMap.get(oaUser.getPrimaryDepartmentId())))
.collect(Collectors.toMap(OaUser::getOaUserId, oaUser -> oaUser)); .collect(Collectors.toMap(OaUser::getOaUserId, oaUser -> oaUser));
...@@ -126,6 +127,8 @@ public abstract class AbstractCostService implements CostService { ...@@ -126,6 +127,8 @@ public abstract class AbstractCostService implements CostService {
}); });
} }
}
@Resource @Resource
CostReviewerMapper costReviewerMapper; CostReviewerMapper costReviewerMapper;
@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