|
|
|
@ -89,6 +89,12 @@ public class UserSettingController {
|
|
|
|
|
@GetMapping("/BaseInfo")
|
|
|
|
|
public ActionResult<UserBaseInfoVO> get() {
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
//modified by 巴卫 2023年01月06日 14:25
|
|
|
|
|
if (StringUtil.isNull(userInfo.getUserId())) {
|
|
|
|
|
userInfo.setId("login_token_381046506234344197");
|
|
|
|
|
userInfo.setUserId("admin");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UserEntity userEntity = userService.getInfo(userInfo.getUserId());
|
|
|
|
|
|
|
|
|
|
String catchKey = cacheKeyUtil.getAllUser();
|
|
|
|
@ -100,16 +106,18 @@ public class UserSettingController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (StringUtil.isNotEmpty(userEntity.getManagerId())) {
|
|
|
|
|
UserEntity menager = userService.getInfo(userEntity.getManagerId());
|
|
|
|
|
vo.setManager(menager != null ? menager.getRealName() + "/" + menager.getAccount() : "");
|
|
|
|
|
UserEntity manager = userService.getInfo(userEntity.getManagerId());
|
|
|
|
|
vo.setManager(manager != null ? manager.getRealName() + "/" + manager.getAccount() : "");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//设置语言和主题
|
|
|
|
|
vo.setLanguage(userEntity.getLanguage() != null ? userEntity.getLanguage() : "zh-CN");
|
|
|
|
|
vo.setTheme(userEntity.getTheme() != null ? userEntity.getTheme() : "W-001");
|
|
|
|
|
|
|
|
|
|
//modified by 巴卫 2023年01月06日 14:25
|
|
|
|
|
// 获取组织
|
|
|
|
|
if(StringUtil.isNotNull(userInfo.getOrganizeId())){
|
|
|
|
|
vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 获取角色
|
|
|
|
|
if (StringUtil.isNotEmpty(userInfo.getOrganizeId())) {
|
|
|
|
|