From b523cf62af9369901cdeff2b2ae188a0af856558 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:47:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 355754f..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
@@ -132,7 +137,9 @@
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("淇敼鐢ㄦ埛澶辫触");
}
@@ -202,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