From 8240b82bc87ab1a93837d958e033baa06a8b61ce Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 1 Aug 2024 17:54:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/supervision/police/controller/RoleController.java   | 5 +++--
 .../com/supervision/police/controller/UserController.java   | 6 ++++--
 .../service/impl/SystemRoleMenuRelationServiceImpl.java     | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/supervision/police/controller/RoleController.java b/src/main/java/com/supervision/police/controller/RoleController.java
index ff405ef..abdc87e 100644
--- a/src/main/java/com/supervision/police/controller/RoleController.java
+++ b/src/main/java/com/supervision/police/controller/RoleController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Tag(name = "用户角色管理")
 @RestController
-@RequestMapping("/roleManage")
+@RequestMapping("/role")
 @RequiredArgsConstructor
 public class RoleController {
 
@@ -26,8 +26,9 @@ public class RoleController {
 
     @Operation(summary = "修改角色")
     @PostMapping("/update")
-    public void updateRole(@RequestBody RoleDTO roleDTO) {
+    public R<?> updateRole(@RequestBody RoleDTO roleDTO) {
         roleService.updateRole(roleDTO);
+        return R.ok();
     }
 
     @Operation(summary = "删除角色")
diff --git a/src/main/java/com/supervision/police/controller/UserController.java b/src/main/java/com/supervision/police/controller/UserController.java
index ee468ef..b2828e0 100644
--- a/src/main/java/com/supervision/police/controller/UserController.java
+++ b/src/main/java/com/supervision/police/controller/UserController.java
@@ -36,14 +36,16 @@ public class UserController {
 
     @Operation(summary = "修改用户信息")
     @PostMapping("/update")
-    public void updateUser(@RequestBody UserInfoReqVo userInfoReqVo) {
+    public R<?> updateUser(@RequestBody UserInfoReqVo userInfoReqVo) {
         userService.updateUserInfo(userInfoReqVo);
+        return R.ok();
     }
 
     @Operation(summary = "修改用户状态")
     @PostMapping("/updateUserStatus")
-    public void updateUserStatus(@RequestBody UserStatusReqVo userStatusReqVo) {
+    public R<?> updateUserStatus(@RequestBody UserStatusReqVo userStatusReqVo) {
         userService.updateUserStatus(userStatusReqVo);
+        return R.ok();
     }
 
     @Operation(summary = "删除用户信息")
diff --git a/src/main/java/com/supervision/police/service/impl/SystemRoleMenuRelationServiceImpl.java b/src/main/java/com/supervision/police/service/impl/SystemRoleMenuRelationServiceImpl.java
index 2e631d0..b265b97 100644
--- a/src/main/java/com/supervision/police/service/impl/SystemRoleMenuRelationServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/SystemRoleMenuRelationServiceImpl.java
@@ -2,6 +2,7 @@ package com.supervision.police.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.police.domain.SystemRoleMenuRelation;
 import com.supervision.police.domain.SystemUserRoleRelation;
@@ -27,6 +28,9 @@ public class SystemRoleMenuRelationServiceImpl extends ServiceImpl<SystemRoleMen
     public void updateRoleMenu(String roleId, List<String> menuIds) {
         Assert.notEmpty(roleId, "角色id不能为空");
 
+        // 清除角色菜单关联数据
+        deleteRoleMenu(roleId);
+
         if (CollUtil.isNotEmpty(menuIds)){
             List<SystemRoleMenuRelation> list = menuIds.stream().map(menuId -> new SystemRoleMenuRelation(roleId, menuId)).toList();
             list.forEach(super::save);
@@ -35,7 +39,7 @@ public class SystemRoleMenuRelationServiceImpl extends ServiceImpl<SystemRoleMen
 
     @Override
     public void deleteRoleMenu(String roleId) {
-        super.remove(lambdaQuery().eq(SystemRoleMenuRelation::getRoleId, roleId));
+        super.remove(new LambdaQueryWrapper<SystemRoleMenuRelation>().eq(SystemRoleMenuRelation::getRoleId, roleId));
     }
 
     @Override