From c137760697814b57c8ccb92cb1e0ed9d873f3045 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:46 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..6da0c6d 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,7 +81,10 @@
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);
+ 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());
}
@@ -103,7 +106,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()));
@@ -120,7 +126,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