From eababfda8c8d1ce4828752d336e84e524cf40d59 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 29 Jun 2023 09:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90hr=E3=80=91?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HrOrgApproverServiceImpl.java        | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java
index e79275567..6a5067a58 100644
--- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java
+++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java
@@ -21,11 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -62,14 +58,13 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
         LambdaQueryWrapper<HrOrgApprover> hrOrgApproverLambdaQueryWrapper = new LambdaQueryWrapper<>();
         hrOrgApproverLambdaQueryWrapper.eq(HrOrgApprover::getOrgId, hrOrgApproverRequest.getOrgId());
         List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper);
-        
+
         // 将每个类型的用户分组，key是审批组类型，value是该组下的用户
-        Map<Integer, List<HrOrgApprover>> groupingByUsers=new HashMap<>();
+        Map<Integer, List<HrOrgApprover>> groupingByUsers = new HashMap<>();
         if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
-        	 groupingByUsers = orgTotalBindingList.stream()
-                     .collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
+            groupingByUsers = orgTotalBindingList.stream().collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
         }
-       
+
 
         // 先初始化空的绑定情况列表
         ArrayList<HrOrgApprover> resultList = new ArrayList<>();
@@ -80,14 +75,14 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
             hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
 
             if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
-            	 // 设置该类型下的审批人列表
+                // 设置该类型下的审批人列表
                 List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType());
                 if (ObjectUtil.isNotEmpty(userList)) {
                     List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList);
                     hrOrgApprover.setBindUserItemList(bindUserItems);
                 }
             }
-           
+
 
             resultList.add(hrOrgApprover);
         }