From be95b8c4694e788eb646203c7c74b72098bb8d6b Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期二, 11 五月 2021 16:36:09 +0800
Subject: [PATCH] 用户角色菜单接口更新

---
 src/main/java/com/whyc/controller/UserController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index b19d605..4ae727f 100644
--- a/src/main/java/com/whyc/controller/UserController.java
+++ b/src/main/java/com/whyc/controller/UserController.java
@@ -50,7 +50,7 @@
 
     @PostMapping
     @ApiOperation(value = "娣诲姞鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
+    //@RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
     public Response add(@RequestBody User user){
         return userService.add(user);
     }
@@ -68,44 +68,44 @@
 
     @GetMapping("/all")
     @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴�")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public List<User> getAll(){
         return userService.getAll();
     }
 
     @GetMapping("/page")
     @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public IPage<User> getPage(@RequestParam int pageNum,@RequestParam int pageSize){
         Page<Object> page = new Page<>(pageNum, pageSize);
         return userService.getAllWithPage(page);
     }
     @PostMapping("/search")
     @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public Response<IPage<User>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody User user){
         return userService.getPageByCondition(pageNum,pageSize,user);
     }
 
     @PutMapping
     @ApiOperation(value = "缂栬緫鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:update"})
+    //@RequiresPermissions(value = {"user:update"})
     public Response update(@RequestBody User user){
         return userService.update(user);
     }
 
     @PutMapping("freezeUser")
-    @ApiOperation(value = "鍐荤粨鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:update"})
-    public Response updateUserFreeze(@RequestParam int id){
-        return userService.updateUserFreeze(id);
+    @ApiOperation(value = "鍚姩/鍐荤粨鐢ㄦ埛")
+    //@RequiresPermissions(value = {"user:update"})
+    public Response updateUserFreeze(@RequestParam int id,@RequestParam int state){
+        return userService.updateUserFreeze(id,state);
     }
 
     @PutMapping("deleteUser")
     @ApiOperation(value = "鍒犻櫎鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:delete"})
+    //@RequiresPermissions(value = {"user:delete"})
     public Response delete(@RequestParam int id){
-        return userService.deleteUser(id);
+        return userService.delete(id);
     }
 
     /**

--
Gitblit v1.9.1