From 9219488d53d9ab234321ca1bb0b7322a9a2d1882 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 13:50:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 16 +++++++++++++---
1 files changed, 13 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..8d29597 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -11,6 +11,7 @@
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.result.KeyValueVo;
+import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.RoleService;
@@ -28,6 +29,8 @@
private UserService userService;
@Autowired
private RoleService roleService;
+ @Autowired
+ private CstmrService cstmrService;
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
@@ -121,15 +124,22 @@
@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瀛楁
+ cstmrService.updateDeptIdByUserId(user.getId(), user.getDeptId());
+ }
+ if (!userService.updateById(user)) {
+ throw new CoolException("淇敼鐢ㄦ埛澶辫触");
+ }
return R.ok();
}
--
Gitblit v1.9.1