From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/system/controller/UserController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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..c175ac5 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -80,7 +80,7 @@
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
     public R edit(User user) {
         if (Cools.isEmpty(user)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == user.getId()){
             user.setStatus(1);
@@ -105,7 +105,7 @@
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
     public R update(User user){
         if (Cools.isEmpty(user) || null==user.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         User entity = userService.selectById(user.getId());
         if (user.getPassword()!=null) {
@@ -117,17 +117,19 @@
         if (user.getMobile()!=null) {
             entity.setMobile(user.getMobile());
         }
+        if (user.getRoleId() !=null) {
+            entity.setRoleId(user.getRoleId());
+        }
         userService.updateById(entity);
         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