From 75c6f12ec7fdd79781a61c7485ed146b258f6b83 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 11:45:15 +0800
Subject: [PATCH] 12.18

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 2ef990c..1b07413 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -37,10 +37,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -83,7 +80,8 @@
 		Long userid = tokenService.getLoginUser().getUserid();
 		SysUser sysUser = sysUserService.getById(userid);
 		LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
-				.notIn(SysRole::getRoleId, Arrays.asList(2, 77, 78, 79, 80))
+				.ne(SysRole::getRoleId, 2)
+				.isNull(SysRole::getShopId)
 				.eq(SysRole::getDelFlag, 0)
 				.eq(SysRole::getStatus, 0);
 		if (sysUser.getRoleType() == 2) {

--
Gitblit v1.7.1