From ff9ad067f57593b47f781360ed4c36e2cfce14e6 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Tue, 7 Jan 2025 14:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/controller/UserController.java   |  5 +++--
 .../software/manage/pojo/req/UserRoleRequest.java    | 12 ------------
 .../software/manage/service/UserService.java         |  4 +++-
 .../manage/service/serviceimpl/UserServiceImpl.java  |  6 +++---
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRoleRequest.java

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
index eedfc9c..e8806b7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RequestMapping("/data/ed/user")
 @RestController
@@ -80,8 +81,8 @@ public class UserController {
 
     @ApiOperation(value = "人员绑定", notes = "")
     @RequestMapping(value = "/bindRoles", method = RequestMethod.POST)
-    public ElectromagneticResult<?> bindRoles(@RequestBody UserRoleRequest userRoleRequest) {
-        if (userService.bindRoles(userRoleRequest)) {
+    public ElectromagneticResult<?> bindRoles(@RequestBody List<UserBindRoleDTO> list) {
+        if (userService.bindRoles(list)) {
             return ElectromagneticResultUtil.success(true);
         } else {
             return ElectromagneticResultUtil.fail("500", "不可绑定空用户");
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRoleRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRoleRequest.java
deleted file mode 100644
index 3ef12a4..0000000
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRoleRequest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.electromagnetic.industry.software.manage.pojo.req;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class UserRoleRequest {
-
-    List<UserBindRoleDTO> bindData;
-
-}
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
index efa1784..6ea227a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
@@ -3,6 +3,8 @@ package com.electromagnetic.industry.software.manage.service;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.manage.pojo.req.*;
 
+import java.util.List;
+
 public interface UserService {
 
     /**
@@ -81,7 +83,7 @@ public interface UserService {
     /**
      * 人员绑定
      */
-    Boolean bindRoles(UserRoleRequest userRoleRequest);
+    Boolean bindRoles(List<UserBindRoleDTO> list);
 
     /**
      * 重置密码
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
index fdaa1b2..8b827cf 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
@@ -274,11 +274,11 @@ public class UserServiceImpl implements UserService {
      * 人员绑定
      */
     @Override
-    public Boolean bindRoles(UserRoleRequest userRolesRequest) {
-        if (userRolesRequest == null || userRolesRequest.getBindData().isEmpty()) {
+    public Boolean bindRoles(List<UserBindRoleDTO> list) {
+        if (list == null || list.isEmpty()) {
             throw new BizException(-1, "请勿发布空数据");
         }
-        for (UserBindRoleDTO dto : userRolesRequest.getBindData()) {
+        for (UserBindRoleDTO dto : list) {
             activeRole(dto);
             bindRole(dto);
         }