From 80218cded77e65c98a520cb482130b7d4c8d515a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 10 Nov 2023 18:11:18 +0800
Subject: [PATCH] fix:78441

---
 .../system/controller/SysUserController.java        | 13 +++++++------
 .../src/main/resources/i18n/messages_zh.properties  |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 0b2ef75a..1a0960ec 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -777,9 +777,10 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRole")
     @RequiresPermissions("sys:user:sel")
-    public Result<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
-                                         @RequestParam(name="userId",required=true) String userId) {
-          try {
+    public Result<Object> deleteUserRole(@RequestBody  Map<String,String> map) {
+        try {
+            String roleId = map.get("roleId");
+            String userId = map.get("userId");
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
             sysUserRoleService.remove(queryWrapper);
@@ -798,10 +799,10 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRoleBatch")
     @RequiresPermissions("sys:user:sel")
-    public Result<SysUserRole> deleteUserRoleBatch(
-            @RequestParam(name="roleId") String roleId,
-            @RequestParam(name="userIds",required=true) String userIds) {
+    public Result<SysUserRole> deleteUserRoleBatch(@RequestBody Map<String,String> map) {
         try {
+            String roleId = map.get("roleId");
+            String userIds = map.get("userIds");
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(",")));
             sysUserRoleService.remove(queryWrapper);
diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
index b87118d1..fe73aec4 100644
--- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
@@ -35,7 +35,7 @@ please.use.a.file.with.the.suffix.xls=\u8BF7\u4F7F\u7528\u540E\u7F00\u540D\u4E3A
 header.inconsistent.with.template=\u8868\u5934\u4E0E\u6A21\u677F\u4E0D\u4E00\u81F4
 please.select.a.workgroup.for.export=\u8BF7\u9009\u62E9\u5DE5\u4F5C\u7EC4\u8FDB\u884C\u5BFC\u51FA
 the.job.number.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u4E3A\u7A7A
-the.realname.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+the.real.name.cannot.be.empty.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A
 job.number.does.not.exist.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u5B58\u5728
 duplicate.job.number.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u91CD\u590D
 cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u5DF2\u8FC7\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED
@@ -64,6 +64,7 @@ you.have.not.data.auth=\u60A8\u6CA1\u6709{0}\u7684\u6570\u636E\u6743\u9650\uFF0C
 dict.delete.error=\u6807\u7B7E\u5DF2\u88AB\u5F15\u7528\uFF0C\u65E0\u6CD5\u5220\u9664
 parameter.not.recognized=\u53C2\u6570\u4E0D\u8BC6\u522B
 
+
 the.real.name.and.job.number.mismatch.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0E\u5DE5\u53F7\u4E0D\u5339\u914D
 tag.delete.error.3=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
 tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539