From 30350cae29ec19082a9810080e32fcddd4d9df17 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 14:26:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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..17336d9 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -8,9 +8,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.domain.KeyValueVo;
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.entity.param.UserChildrenParam;
+import com.zy.crm.manager.service.CstmrService;
+import com.zy.crm.manager.utils.UserChildrenParamUtils;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.RoleService;
@@ -28,6 +31,8 @@
private UserService userService;
@Autowired
private RoleService roleService;
+ @Autowired
+ private CstmrService cstmrService;
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
@@ -121,15 +126,23 @@
@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());
+ }
+ user.setNickname(user.getUsername());
+ if (!userService.updateById(user)) {
+ throw new CoolException("淇敼鐢ㄦ埛澶辫触");
+ }
return R.ok();
}
@@ -196,5 +209,22 @@
return R.ok().add(valueVos);
}
+ @RequestMapping("/user/id/popup/auth")
+ public R popupUserId(String token) {
+ Long item = 0L;
+ if (Cools.isEmpty(token)){
+ return R.ok();
+ }
+ try{
+ User user = getUser(token);
+ if (Cools.isEmpty(user) || Cools.isEmpty(user.getId())){
+ return R.ok(item);
+ }
+ UserChildrenParam userChildrenParamList = UserChildrenParamUtils.getUserChildrenParamList(user);
+ return R.ok().add(userChildrenParamList);
+ }catch (Exception ignored){ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1