【7.6.0】【hr】格式化代码

pull/57/head
fengshuonan 2023-06-29 09:12:15 +08:00
parent 164af552cd
commit eababfda8c
1 changed files with 7 additions and 12 deletions

View File

@ -21,11 +21,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -64,10 +60,9 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper); List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper);
// 将每个类型的用户分组key是审批组类型value是该组下的用户 // 将每个类型的用户分组key是审批组类型value是该组下的用户
Map<Integer, List<HrOrgApprover>> groupingByUsers=new HashMap<>(); Map<Integer, List<HrOrgApprover>> groupingByUsers = new HashMap<>();
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) { if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
groupingByUsers = orgTotalBindingList.stream() groupingByUsers = orgTotalBindingList.stream().collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
.collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
} }
@ -80,7 +75,7 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode())); hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) { if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
// 设置该类型下的审批人列表 // 设置该类型下的审批人列表
List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType()); List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType());
if (ObjectUtil.isNotEmpty(userList)) { if (ObjectUtil.isNotEmpty(userList)) {
List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList); List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList);