From ec759e2c4e9340a1f447dec93ce4742c1c8c132a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 15:49:14 +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 | 3 ++-
1 files changed, 2 insertions(+), 1 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 4f35f1c..074a50d 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
@@ -81,11 +81,12 @@
SysUser sysUser = sysUserService.getById(userid);
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
.ne(SysRole::getRoleId, 2)
- .isNull(SysRole::getShopId)
.eq(SysRole::getDelFlag, 0)
.eq(SysRole::getStatus, 0);
if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }else {
+ wrapper.isNull(SysRole::getShopId);
}
List<SysRole> list = roleService.list(wrapper);
return AjaxResult.success(list);
--
Gitblit v1.7.1