From 775a4818b1ff4f18f17b24108cc92c23f728ea61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:03:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 8d29597..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,10 +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;
@@ -137,6 +139,7 @@
// todo: 淇敼鍏宠仈鏁版嵁鐨刣eptId瀛楁
cstmrService.updateDeptIdByUserId(user.getId(), user.getDeptId());
}
+ user.setNickname(user.getUsername());
if (!userService.updateById(user)) {
throw new CoolException("淇敼鐢ㄦ埛澶辫触");
}
@@ -206,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