From 1a69de7ac9d58ad8482b1540e13ee66b1adae291 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 17:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
index 852d476..886420a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -502,7 +503,11 @@
LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId);
if(loginUserInfoVO != null){
comActDiscussVO.setUserName(loginUserInfoVO.getName());
- comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
+ if(StringUtils.isEmpty(loginUserInfoVO.getNickName())){
+ comActDiscussVO.setUserNickName(loginUserInfoVO.getName());
+ }else{
+ comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
+ }
comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
comActDiscussVO.setUserType(loginUserInfoVO.getType());
}
--
Gitblit v1.7.1