From 6af54dd88487b017dc27d3003368d2504f9c8401 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 23 Dec 2024 18:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lSun <15893999301@qq.com>
---
 .../basic/service/impl/SysOrgServiceImpl.java    | 16 +++++++++-------
 .../holiday/service/HolidayServiceImpl.java      | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
index 59b72f9..b9fdb7b 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
@@ -66,14 +66,16 @@ public class SysOrgServiceImpl implements SysOrgService {
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
         //管理员与人资角色可以看到所有
-        if (Collections.frequency(roleId, 1L)==0 && Collections.frequency(roleId, 16L)==0) {
-            List<MapVo> orgList = sysUser.getOrgList();
-            if (!orgList.isEmpty()) {
-                ArrayList<String> ids = new ArrayList<>();
-                for (MapVo mapVo : orgList) {
-                    ids.add(String.valueOf(mapVo.getId()));
+        if( roleId !=null && !roleId.isEmpty()){
+            if (Collections.frequency(roleId, 1L)==0 && Collections.frequency(roleId, 16L)==0) {
+                List<MapVo> orgList = sysUser.getOrgList();
+                if (!orgList.isEmpty()) {
+                    ArrayList<String> ids = new ArrayList<>();
+                    for (MapVo mapVo : orgList) {
+                        ids.add(String.valueOf(mapVo.getId()));
+                    }
+                    sysOrg.setOrgList(ids);
                 }
-                sysOrg.setOrgList(ids);
             }
         }
         return orgDao.selectOrgList(sysOrg);
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
index f9c0f9b..61d30f9 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
@@ -64,14 +64,16 @@ public class HolidayServiceImpl implements HolidayService {
         //只能查自己部门的人
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
-        if (Collections.frequency(roleId, 1L)==0) {
-            List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
-            if (!orgList.isEmpty()) {
-                ArrayList<String> ids = new ArrayList<>();
-                for (MapVo mapVo : orgList) {
-                    ids.add(String.valueOf(mapVo.getId()));
+        if(roleId !=null && !roleId.isEmpty() ){
+            if (Collections.frequency(roleId, 1L)==0) {
+                List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
+                if (!orgList.isEmpty()) {
+                    ArrayList<String> ids = new ArrayList<>();
+                    for (MapVo mapVo : orgList) {
+                        ids.add(String.valueOf(mapVo.getId()));
+                    }
+                    bean.setOrgList(ids);
                 }
-                bean.setOrgList(ids);
             }
         }
         return holidayDao.getHolidayList(bean);