From 31c65cd4f338256b76efebdb2f1f29deb170969f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:01:22 +0800
Subject: [PATCH] chore:权限修改提交

---
 screen-api/src/main/java/com/moral/api/controller/UserController.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index ba6d30a..1d1560a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -24,6 +24,7 @@
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.util.PageResult;
+import com.moral.util.WebUtils;
 
 @Slf4j
 @Api(tags = {"������������"})
@@ -53,22 +54,16 @@
 
     @ApiOperation(value = "������������", notes = "������������")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "delete", method = RequestMethod.POST)
-    public ResultMessage delete(@RequestBody User user) {
-        if (user.getId() == null) {
+    @RequestMapping(value = "delete", method = RequestMethod.GET)
+    public ResultMessage delete(Integer id) {
+        if (id == null) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id", user.getId());
-        user = userService.getOne(queryWrapper);
-        if (user == null) {
-            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(),
-                    ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
-        }
-        userService.deleteUser(user);
+        userService.deleteUser(id);
         return ResultMessage.ok();
     }
 
@@ -91,8 +86,8 @@
 
     @ApiOperation(value = "������������������������", notes = "������������������������")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@@ -103,8 +98,13 @@
             @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"),
 
     })
-    @RequestMapping(value = "select", method = RequestMethod.POST)
-    public ResultMessage select(@RequestBody Map<String, Object> parameters) {
+    @RequestMapping(value = "select", method = RequestMethod.GET)
+    public ResultMessage select(HttpServletRequest request) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        if (!parameters.containsKey("page") || !parameters.containsKey("size")) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
         Page<User> userPage = userService.selectUsers(parameters);
         PageResult<User> pageResult = new PageResult<>(
                 userPage.getTotal(), userPage.getPages(), userPage.getRecords()

--
Gitblit v1.8.0