From c31bf5a8902485b750b5814a0d1c54ecc65d2c96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/UserController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 1e8547c..11f0db4 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -104,6 +104,15 @@
 	@RequestMapping(value = "/user/update/auth")
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
     public R update(User user){
+        if (getUserId() != 9527){
+            if (!getUserId().equals(user.getId())){
+                Role role = roleService.selectById(getUser().getRoleId());
+                if (!role.getCode().equals("admin")){
+                    return R.error("鎿嶄綔瓒婃潈锛�");
+                }
+            }
+        }
+
         if (Cools.isEmpty(user) || null==user.getId()){
             return R.error();
         }
@@ -117,17 +126,22 @@
         if (user.getMobile()!=null) {
             entity.setMobile(user.getMobile());
         }
-        userService.updateById(entity);
+        if (user.getRoleId()!=null){
+            entity.setRoleId(user.getRoleId());
+        }
+        if (!userService.updateById(entity)){
+            return R.error("淇敼澶辫触锛�");
+        }
+
         return R.ok();
     }
 
     @RequestMapping(value = "/user/delete/auth")
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
-    public R delete(Integer[] ids){
-        if (Cools.isEmpty(ids)){
-            return R.error();
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+        for (Long id : ids){
+            userService.deleteById(id);
         }
-        userService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
     }
 

--
Gitblit v1.9.1