From 40ab38da836225870e29fc06e2e78631ff382f3f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 12:58:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/system/controller/UserController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/crm/system/controller/UserController.java b/src/main/java/com/zy/crm/system/controller/UserController.java
index e7d8a71..355754f 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -121,15 +121,21 @@
 
     @RequestMapping(value = "/user/update/auth")
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
+    @Transactional
     public R update(User user){
         if (Cools.isEmpty(user) || null==user.getId()){
             return R.error();
         }
-        int count = userService.selectCount(new EntityWrapper<User>().ne("id", user.getId()).eq("username", user.getUsername()));
-        if (count > 0) {
+        if (userService.selectCount(new EntityWrapper<User>().ne("id", user.getId()).eq("username", user.getUsername())) > 0) {
             return R.error("璐﹀彿宸插瓨鍦�");
         }
-        userService.updateById(user);
+        User one = userService.selectById(user.getId());
+        if (!one.getDeptId().equals(user.getDeptId())) {
+            // todo: 淇敼鍏宠仈鏁版嵁鐨刣eptId瀛楁
+        }
+        if (!userService.updateById(user)) {
+            throw new CoolException("淇敼鐢ㄦ埛澶辫触");
+        }
         return R.ok();
     }
 

--
Gitblit v1.9.1