From d6b0b2ccc2477fd6abd86cd463d2cef2b5e40356 Mon Sep 17 00:00:00 2001
From: Liyanjun <Liyanjun@Liyanjun>
Date: Wed, 28 Jun 2023 23:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E7=BB=91=E5=AE=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=88=E5=BD=93=E8=AF=A5=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E6=9C=AA=E9=85=8D=E7=BD=AE=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E6=97=B6=E4=B9=9F=E8=BF=94=E5=9B=9E=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=97=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HrOrgApproverServiceImpl.java        | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 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 36b62c94b..e79275567 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
@@ -22,6 +22,7 @@ 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;
@@ -61,13 +62,14 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
         LambdaQueryWrapper<HrOrgApprover> hrOrgApproverLambdaQueryWrapper = new LambdaQueryWrapper<>();
         hrOrgApproverLambdaQueryWrapper.eq(HrOrgApprover::getOrgId, hrOrgApproverRequest.getOrgId());
         List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper);
-        if (ObjectUtil.isEmpty(orgTotalBindingList)) {
-            return new ArrayList<>();
-        }
-
+        
         // 将每个类型的用户分组，key是审批组类型，value是该组下的用户
-        Map<Integer, List<HrOrgApprover>> groupingByUsers = orgTotalBindingList.stream()
-                .collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
+        Map<Integer, List<HrOrgApprover>> groupingByUsers=new HashMap<>();
+        if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
+        	 groupingByUsers = orgTotalBindingList.stream()
+                     .collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
+        }
+       
 
         // 先初始化空的绑定情况列表
         ArrayList<HrOrgApprover> resultList = new ArrayList<>();
@@ -77,12 +79,15 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
             // 设置类型
             hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
 
-            // 设置该类型下的审批人列表
-            List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType());
-            if (ObjectUtil.isNotEmpty(userList)) {
-                List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList);
-                hrOrgApprover.setBindUserItemList(bindUserItems);
+            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);
         }