From 5ce08dd237ddd51fb1adeb9b5d3f44987d8637e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 12:24:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
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 f6881e8..4f35f1c 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