From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 938846c..d1afa4a 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
@@ -3,16 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.entity.*;
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.service.*;
import com.ruoyi.admin.vo.RoleDetailVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -70,13 +65,14 @@
public R<IPage<Role>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return R.ok(roleService.lambdaQuery().eq(Role::getDelFlag, 0)
+ .ne(Role::getRoleName,"加盟商")
.orderByDesc(Role::getCreateTime).page(Page.of(pageNum, pageSize)));
}
/**
* 角色列表
*/
- @RequiresPermissions("power_role")
+ @RequiresPermissions("power_account")
@ApiOperation(value = "角色列表", tags = {"后台-权限管理-账号管理"})
@GetMapping(value = "/list")
public R<List<Role>> list() {
@@ -148,6 +144,8 @@
return roleService.saveRoleAndMenu(roleRequest, loginUser) ? R.ok() : R.fail();
}
+ @Resource
+ private UserRoleService userRoleService;
/**
* 根据id批量删除角色
*
@@ -165,11 +163,19 @@
List<Role> list = roleService.lambdaQuery().in(Role::getRoleId, idList).list();
for (Role role : list) {
Long roleId = role.getRoleId();
+ List<Long> collect = userRoleService.lambdaQuery().eq(UserRole::getRoleId, roleId).list().stream().map(UserRole::getUserId).collect(Collectors.toList());
+ if (!collect.isEmpty()){
List<SysUser> sysUserList = userService.lambdaQuery()
- .eq(SysUser::getRoleId, roleId)
+ .in(SysUser::getUserId,collect)
.eq(SysUser::getIsDelete, 0).list();
if (sysUserList.isEmpty()) {
role.setDelFlag("2");
+ }else {
+ return R.repeatedSubmission("角色已关联账号，请先解除关联！");
+ }
+ }else {
+ role.setDelFlag("2");
+
}
// 删除菜单关联信息
roleMenuService.remove(new QueryWrapper<RoleMenu>().eq("role_id", roleId));
--
Gitblit v1.7.1