From 6b3e831d44e657c0bd094c3ad4586665f1bfa7b2 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Thu, 19 May 2022 20:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0=E4=BA=86?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ncst/award/controller/UserController.java | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/awardBE/src/main/java/edu/ncst/award/controller/UserController.java b/awardBE/src/main/java/edu/ncst/award/controller/UserController.java
index f827977..1889ffa 100644
--- a/awardBE/src/main/java/edu/ncst/award/controller/UserController.java
+++ b/awardBE/src/main/java/edu/ncst/award/controller/UserController.java
@@ -15,13 +15,13 @@ import edu.ncst.award.utils.StringUtils;
 import edu.ncst.award.vo.ResultVO;
 import edu.ncst.award.vo.param.CurrentUserDTO;
 import edu.ncst.award.vo.param.query.PageQuery;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.bcrypt.BCrypt;
-import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
  * 用户 控制器
  */
 @Slf4j
+@Api(tags = "用户")
 @RestController
-@Controller
 @RequiredArgsConstructor
 @RequestMapping("/api/user")
 public class UserController extends BaseController {
@@ -111,11 +111,25 @@ public class UserController extends BaseController {
         return toAjax(userService.updateUser(user));
     }
 
+    /**
+     * 删除用户
+     */
+    @ApiOperation("删除用户")
+    @DeleteMapping("/{userIds}")
+    public ResultVO<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds, @RequestBody User user) {
+        // 前端回传来一个deleteUserId我用User对象接收
+//        if (ArrayUtil.contains(userIds, getUserId())) {
+        // this getUserId will return current User id
+//            return ResultUtils.error("当前用户不能删除");
+//        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+
     @ApiOperation("获取当前用户信息")
     @GetMapping("/current")
     public ResponseEntity<?> getCurrentUser() {
         CurrentUserDTO currentUserDTO = userService.getCurrentUser();
-
         return ResponseUtils.success(currentUserDTO);
     }