From 77a1945d04df0d2f23abb9d8925c47c1cf224f2a Mon Sep 17 00:00:00 2001
From: bupengxiang <15022776095@163.com>
Date: Tue, 1 Aug 2023 09:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 19 ++++++++++---------
 .../modules/system/entity/SysUserRole.java    |  9 ++++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index d89b3ddf..611ffab7 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -786,12 +786,13 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRole")
     @RequiresPermissions("sys:user:sel")
-    public Results<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
-                                          @RequestParam(name="userId",required=true) String userId) {
-          try {
-            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
-            sysUserRoleService.remove(queryWrapper);
+    public Results<Object> deleteUserRole(@RequestBody SysUserRole sysUserRole) {
+        try {
+           String userId = sysUserRole.getUserId();
+           String roleId = sysUserRole.getRoleId();
+           QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+           queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
+           sysUserRoleService.remove(queryWrapper);
               return Results.OK(DEL_SUCCESS);
         }catch(Exception e) {
             SysUserController.log.error(e.getMessage(), e);
@@ -807,10 +808,10 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRoleBatch")
     @RequiresPermissions("sys:user:sel")
-    public Results<SysUserRole> deleteUserRoleBatch(
-            @RequestParam(name="roleId") String roleId,
-            @RequestParam(name="userIds",required=true) String userIds) {
+    public Results<SysUserRole> deleteUserRoleBatch(@RequestBody SysUserRole sysUserRole) {
         try {
+            String roleId = sysUserRole.getRoleId();
+            String userIds = sysUserRole.getUserIds();
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(",")));
             sysUserRoleService.remove(queryWrapper);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUserRole.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUserRole.java
index 0108d9d3..5305c516 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUserRole.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUserRole.java
@@ -1,14 +1,14 @@
 package com.jero.modules.system.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户角色表
@@ -37,6 +37,9 @@ public class SysUserRole implements Serializable {
      */
     private String roleId;
 
+    @TableField(exist = false)
+    private String userIds;
+
 	public SysUserRole() {
 	}