From 42f81f9c7bb1ddaf8b04ce34fedd855472b0f500 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Sat, 11 Jan 2025 14:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lSun <15893999301@qq.com>
---
 .../holiday/controller/HolidayController.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java
index a326748..7e2a555 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java
@@ -54,9 +54,24 @@ public class HolidayController extends BaseController {
     @Log(title = "流程管理->假期管理->列表查询", businessType = BusinessType.QUERY)
     public TableDataInfo list(HolidayBean bean) {
         try{
+            //不是管理员，只能查自己
+            Long userId = SecurityUtils.getUserId();
+            List<SysRole> sysRoleList = dao.getRoleListByUserId(userId);
+            int roleCount = 0;
+            if(!sysRoleList.isEmpty()){
+                for (SysRole sysRole : sysRoleList) {
+                    if(sysRole.getRoleName().contains("管理员")){
+                        roleCount = 1;
+                        break;
+                    }
+                }
+            }
+            if(roleCount==1){
+
+            }else{
+                bean.setUserId(userId);
+            }
             startPage();
-            //只能查询自己的或自己导入的
-            bean.setUserId(SecurityUtils.getLoginUser().getSysUser().getUserId());
             return getDataTable(holidayService.getHolidayList(bean));
         }catch (Exception e){
             log.error(e.toString(),e);