From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java |    5 ++++-
 1 files changed, 4 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 005eb40..6328de8 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
@@ -450,7 +450,9 @@
                                 comActDiscussCommentVO1.setHaveSign(0);
                             }
                         }
-
+                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
+                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
+                        }
                     });
                     comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
                 }
@@ -528,6 +530,7 @@
         if (type1.intValue()>1) {
             ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId);
             comActDiscussVO.setUserName(comActVO.getName());
+            comActDiscussVO.setUserNickName(comActVO.getName());
         }
         if(loginUserId != null && !loginUserId.equals(0L)){
             ComActDiscussVO comActDiscussVO1=comActDiscussDAO.selectHaveSignAndHaveVote(id,loginUserId);

--
Gitblit v1.7.1