From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 58925e1..8e3689c 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
@@ -160,7 +160,7 @@
/**
* 一起议-回复
- *
+ *
* @param comActDiscussCommentDTO
* 评论内容
* @return 回复结果
@@ -469,7 +469,9 @@
.collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) {
String userName = collect.get(0).getUserName();
+ String userNickName = collect.get(0).getUserNickName();
comActDiscussCommentVO1.setUserNameBack(userName);
+ comActDiscussCommentVO1.setUserNickNameBack(userNickName);
}
List<ComActDiscussCommentVO> collect1 = records.stream()
.filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId))
@@ -495,9 +497,9 @@
comActDiscussCommentVO1.setHaveSign(0);
}
}
- if (StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())) {
- comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
- }
+// if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
+// comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
+// }
});
comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
}
@@ -668,7 +670,7 @@
/**
* 工作大屏-一起议列表
- *
+ *
* @param discussListDTO
* 请求参数
* @return 一起议列表
--
Gitblit v1.7.1