From 103cb3dbd9df9a32565d718b782edcb1b0fdf51c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:59 +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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..f6881e8 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
@@ -38,6 +38,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -81,8 +82,11 @@
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>()
+ .notIn(SysRole::getRoleId, Arrays.asList(2, 77, 78, 79, 80))
+ .eq(SysRole::getDelFlag, 0)
+ .eq(SysRole::getStatus, 0);
+ if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
}
List<SysRole> list = roleService.list(wrapper);
@@ -106,6 +110,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()));
@@ -122,7 +127,7 @@
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
- .eq(SysRole::getRoleName, dto.getRoleName());
+ .eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
if(sysUser.getRoleType() == 2){
--
Gitblit v1.7.1