|
|
@@ -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());
|
|
|
}
|