From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败

---
 src/main/java/com/zy/system/controller/UserController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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..78623cd 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -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