From 1ee76c252f2dbba62e0ec34cccf9eaac51de9083 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 16:25:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 64 ++++++--------------------------
1 files changed, 12 insertions(+), 52 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 074a50d..bb6334d 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
@@ -19,7 +19,6 @@
import com.ruoyi.system.api.model.GetSysRoleByIds;
import com.ruoyi.system.domain.SysMenus;
import com.ruoyi.system.domain.SysRoleMenu;
-import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.RoleAddDto;
import com.ruoyi.system.domain.dto.RoleUpdateDto;
import com.ruoyi.system.domain.vo.RoleInfoVo;
@@ -29,7 +28,6 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserRoleService;
import com.ruoyi.system.service.ISysUserService;
-import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
@@ -37,7 +35,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -74,20 +74,13 @@
private ISysUserService sysUserService;
- @ApiOperation(value = "获取角色列表", tags = {"管理后台-账号管理", "门店后台-账号管理"})
+ @ApiOperation(value = "获取角色列表", tags = {"管理后台-权限管理"})
@GetMapping("/list")
public AjaxResult list() {
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserService.getById(userid);
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);
}
@@ -95,44 +88,26 @@
@ResponseBody
@GetMapping("/listPage")
- @ApiOperation(value = "获取角色列表", tags = {"管理后台-权限管理", "门店后台-权限管理"})
+ @ApiOperation(value = "获取角色列表", tags = {"角色管理"})
public AjaxResult listPage(String name, BasePage basePage) {
PageInfo<SysRole> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getStatus, 0).eq(SysRole::getDelFlag, 0);
if (StringUtils.isNotEmpty(name)) {
wrapper.like(SysRole::getRoleName, name);
}
- Long userid = tokenService.getLoginUser().getUserid();
- 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()));
- record.setNumber(count);
- }
return AjaxResult.success(page);
}
@ResponseBody
@PostMapping("/roleAdd")
- @ApiOperation(value = "添加角色", tags = {"管理后台-权限管理", "门店后台-权限管理"})
+ @ApiOperation(value = "添加角色", tags = {"角色管理"})
public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto) {
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
.eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserService.getById(userid);
- if(sysUser.getRoleType() == 2){
- wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
- }
-
long count = roleService.count(wrapper);
if (count > 0) {
return AjaxResult.error("角色已存在，请重新输入");
@@ -146,17 +121,13 @@
role.setRemark(dto.getRemark());
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
-
- if(sysUser.getRoleType() == 2){
- role.setShopId(sysUser.getObjectId());
- }
roleService.insertRole(role);
return AjaxResult.success();
}
@GetMapping("/roleInfo")
- @ApiOperation(value = "角色详情", tags = {"管理后台-权限管理"})
+ @ApiOperation(value = "角色详情", tags = {"角色管理"})
public AjaxResult roleInfo(@RequestParam Long id) {
SysRole role = roleService.selectRoleById(id);
RoleInfoVo roleInfoVo = new RoleInfoVo();
@@ -192,7 +163,7 @@
@PostMapping("/roleUpdate")
- @ApiOperation(value = "编辑角色", tags = {"管理后台-权限管理"})
+ @ApiOperation(value = "编辑角色", tags = {"角色管理"})
public AjaxResult roleUpdate(@Validated @RequestBody RoleUpdateDto dto) {
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
@@ -208,20 +179,9 @@
ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
List<Long> menuIds = dto.getMenuIds();
// 移除原来的权限菜单
- if (menuIds.contains(1061L)) {
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId, dto.getRoleId()));
- } else {
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId, dto.getRoleId())
- .ne(SysRoleMenu::getMenuId, 1061L)
- .ne(SysRoleMenu::getMenuId, 1062L)
- .ne(SysRoleMenu::getMenuId, 1065L)
- .ne(SysRoleMenu::getMenuId, 1073L)
- .ne(SysRoleMenu::getMenuId, 1161L)
- .ne(SysRoleMenu::getMenuId, 1203L)
- );
- }
+ sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
+ .eq(SysRoleMenu::getRoleId, dto.getRoleId())
+ );
for (Long menuId : menuIds) {
SysRoleMenu sysRoleMenu = new SysRoleMenu();
sysRoleMenu.setMenuId(menuId);
@@ -238,7 +198,7 @@
*/
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
- @ApiOperation(value = "删除角色", tags = {"管理后台-权限管理"})
+ @ApiOperation(value = "删除角色", tags = {"角色管理"})
public AjaxResult remove(@PathVariable Long[] roleIds) {
return toAjax(roleService.deleteRoleByIds(roleIds));
}
--
Gitblit v1.7.1