From ea220e17473aaa0b1a1c16bfa63e137c120f4a46 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 15:41:51 +0800
Subject: [PATCH] 12.18
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 14 +++++++++-----
1 files changed, 9 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 d138b72..4519303 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,9 +37,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -81,9 +79,14 @@
public AjaxResult list() {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
- LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getDelFlag, 0).eq(SysRole::getStatus, 0);
- if(sysUser.getRoleType() == 2){
+ LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
+ .ne(SysRole::getRoleId, 2)
+ .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);
@@ -106,6 +109,7 @@
}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