From 562699fa6d0c279fe0f4f81ce87c336a34a3fb91 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 23 七月 2024 14:32:23 +0800
Subject: [PATCH] feat: 数据迁移;netty通信;bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
index 2bd0630..938846c 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java
@@ -7,10 +7,12 @@
import com.ruoyi.admin.entity.Menu;
import com.ruoyi.admin.entity.Role;
import com.ruoyi.admin.entity.RoleMenu;
+import com.ruoyi.admin.entity.SysUser;
import com.ruoyi.admin.request.RoleRequest;
import com.ruoyi.admin.service.MenuService;
import com.ruoyi.admin.service.RoleMenuService;
import com.ruoyi.admin.service.RoleService;
+import com.ruoyi.admin.service.SysUserService;
import com.ruoyi.admin.vo.RoleDetailVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -48,6 +50,8 @@
private RoleMenuService roleMenuService;
@Resource
private MenuService menuService;
+ @Resource
+ private SysUserService userService;
/**
@@ -88,7 +92,6 @@
*
* @param id 角色id
*/
- @RequiresPermissions("power_role")
@ApiOperation(value = "角色详情", tags = {"后台-权限管理-角色管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -109,7 +112,7 @@
*
* @param roleRequest 角色信息
*/
- @RequiresPermissions("power_role")
+ @RequiresPermissions("role_update")
@ApiOperation(value = "编辑角色", tags = {"后台-权限管理-角色管理"})
@PostMapping(value = "/update")
public R<RoleDetailVO> update(@RequestBody RoleRequest roleRequest) {
@@ -134,7 +137,7 @@
*
* @param roleRequest 角色信息
*/
- @RequiresPermissions("power_role")
+ @RequiresPermissions("role_save")
@ApiOperation(value = "新增角色", tags = {"后台-权限管理-角色管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody RoleRequest roleRequest) {
@@ -150,7 +153,7 @@
*
* @param ids 角色id拼接
*/
- @RequiresPermissions("power_role")
+ @RequiresPermissions("role_delete")
@ApiOperation(value = "批量删除角色", tags = {"后台-权限管理-角色管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -158,11 +161,18 @@
})
public R<String> batchDelete(@RequestParam String ids) {
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
+ // 判断角色是否已存在关联账号
List<Role> list = roleService.lambdaQuery().in(Role::getRoleId, idList).list();
- list.forEach(data -> data.setDelFlag("2"));
- // 删除角色需要删除角色所关联的菜单信息
- for (String id : idList) {
- roleMenuService.remove(new QueryWrapper<RoleMenu>().eq("role_id", id));
+ for (Role role : list) {
+ Long roleId = role.getRoleId();
+ List<SysUser> sysUserList = userService.lambdaQuery()
+ .eq(SysUser::getRoleId, roleId)
+ .eq(SysUser::getIsDelete, 0).list();
+ if (sysUserList.isEmpty()) {
+ role.setDelFlag("2");
+ }
+ // 删除菜单关联信息
+ roleMenuService.remove(new QueryWrapper<RoleMenu>().eq("role_id", roleId));
}
return roleService.updateBatchById(list) ? R.ok() : R.fail();
}
--
Gitblit v1.7.1