From 80b0f1c692a3ecbe46f1dad59d8924bd7b09b148 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 17:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 3 +++
1 files changed, 3 insertions(+), 0 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 b841724..b77fcc6 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
@@ -103,7 +103,10 @@
SysUser sysUser = sysUserService.getById(userid);
if(sysUser.getRoleType() == 2){
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }else{
+ wrapper.isNull(SysRole::getShopId);
}
+ wrapper.ne(SysRole::getRoleId,2);//过滤门店管理员
PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
for (SysRole record : page.getRecords()) {
long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
--
Gitblit v1.7.1