Ver Fonte

update 优化启动时间

18339543638 há 3 anos atrás
pai
commit
5c31452478

+ 2 - 0
nb-auth/src/main/java/com/nb/auth/controller/vo/UserInfoVO.java

@@ -21,6 +21,8 @@ public class UserInfoVO implements Serializable {
 
     private String realName;
 
+    private String nickname;
+
     private String avatar;
 
     private String desc;

+ 3 - 1
nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AppAssistantUserOperator.java

@@ -1,6 +1,7 @@
 package com.nb.app.assistant.auth;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
@@ -81,6 +82,7 @@ public class AppAssistantUserOperator implements IAccountOperator<AssistUserConf
         AccountInfoVO<AssistUserConfig> result = new AccountInfoVO();
         result.setAvatar(user.getAvatar());
         result.setRealName(user.getNickname());
+        result.setNickname(user.getNickname());
         result.setSex(user.getSex());
         Map<String, Object> map = new HashMap<>();
         map.put("unEvalNotify",user.getUnEvalNotify());
@@ -96,7 +98,7 @@ public class AppAssistantUserOperator implements IAccountOperator<AssistUserConf
         source.setId(loginUser.getId());
         source.setAvatar(req.getAvatar());
         source.setSex(req.getSex());
-        source.setNickname(req.getRealName());
+        source.setNickname(StrUtil.isNotEmpty(req.getRealName())?req.getRealName():req.getNickname());
         if(req.getExtendFields()!=null){
             source.setUnEvalNotify(Value.simple(req.getExtendFields().get("unEvalNotify")).asBoolean());
         }

+ 3 - 1
nb-service/app-doctor/src/main/java/com/nb/app/doctor/auth/AppDoctorUserAccountOperator.java

@@ -1,6 +1,7 @@
 package com.nb.app.doctor.auth;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nb.app.doctor.controller.vo.DoctorUserVo;
@@ -70,6 +71,7 @@ public class AppDoctorUserAccountOperator implements IAccountOperator<DoctorUser
         result.setExtendFields(JSONUtil.parseObj(Optional.ofNullable(vo).orElse(new DoctorUserVo()))
         );
         result.setAvatar(appDoctorUser.getAvatar());
+        result.setNickname(appDoctorUser.getRealName());
         result.setRealName(appDoctorUser.getRealName());
         result.setSex(appDoctorUser.getSex());
         return result;
@@ -82,7 +84,7 @@ public class AppDoctorUserAccountOperator implements IAccountOperator<DoctorUser
         AppDoctorUserEntity source = new AppDoctorUserEntity();
         source.setId(loginUser.getId());
         source.setAvatar(req.getAvatar());
-        source.setRealName(req.getRealName());
+        source.setRealName(StrUtil.isEmpty(req.getRealName())?req.getNickname():req.getRealName());
         source.setSex(req.getSex());
         source.setResume(extendFields.getResume());
         source.setPost(extendFields.getPost());

+ 5 - 1
nb-service/web-service/src/main/java/com/nb/web/service/system/auth/DefaultAccountOperator.java

@@ -64,7 +64,9 @@ public class DefaultAccountOperator implements IAccountOperator {
             }).collect(Collectors.toList());
             userInfoVO.setUserId(sysUser.getId().toString());
             userInfoVO.setUsername(sysUser.getAccount());
-            userInfoVO.setRealName(sysUser.getNickname());
+            String realname=StrUtil.isNotEmpty(sysUser.getRealname())?sysUser.getRealname():sysUser.getNickname();
+            userInfoVO.setRealName(realname);
+            userInfoVO.setNickname(sysUser.getNickname());
             userInfoVO.setAvatar(sysUser.getAvatar());
             userInfoVO.setDesc(sysUser.getRemarks());
             userInfoVO.setRoles(roleInfoVOList);
@@ -116,6 +118,8 @@ public class DefaultAccountOperator implements IAccountOperator {
         LoginUser<Long> loginUser = SecurityUtil.getLoginUser();
         SysUser entity = BeanUtil.copyProperties(req, SysUser.class);
         entity.setId(loginUser.getId());
+        entity.setNickname(req.getNickname());
+        entity.setRealname(req.getRealName());
         sysUserService.updateById(entity);
     }