From 03e7f875fb31d592af1066a63cad2e185c79b5ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 08 六月 2021 17:12:54 +0800
Subject: [PATCH] 修改随手拍、微心愿、一起议昵称显示问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 7 +++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 2 ++
9 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
index 43163ec..a200e87 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
@@ -45,6 +45,9 @@
@ApiModelProperty("评论人名字")
private String userName;
+ @ApiModelProperty("评论人昵称")
+ private String userNickName;
+
@ApiModelProperty("回复人名字")
private String userNameBack;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
index 8e6c19a..7f3a19b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -61,6 +61,9 @@
@ApiModelProperty("发布人名字")
private String userName;
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
@ApiModelProperty("发布人头像")
private String imageUrl;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
index d6abe23..b4d59a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -31,6 +31,9 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发起人昵称")
+ private String userNickName;
+
@ApiModelProperty("发生地址")
@NotBlank(groups = {AddGroup.class},message = "发生地址不能为空")
private String happenAddr;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
index 8b5f715..bcca745 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -32,6 +32,9 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发起人昵称")
+ private String userNickName;
+
@ApiModelProperty("发起人头像")
private String imageUrl;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
index 1ba1de0..c16b240 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
@@ -29,6 +29,7 @@
@Select("" +
"SELECT\n" +
"u.`name` userName,\n" +
+ "u.`nick_name` userNickName,\n" +
"u.`image_url`,\n" +
"u.phone,\n" +
"c.`comment`,\n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
index 4f72973..62a8724 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -103,6 +103,7 @@
"COUNT( DISTINCT c.id ) commentNum,\n" +
"COUNT( DISTINCT du.id ) signNum,\n" +
"if(u.type=1,u.name,a.name) userName,\n" +
+ "if(u.type=1,u.nick_name,a.name) userNickName,\n" +
"if(du.id is not null,1,0) haveSign,\n" +
"if(ou.id is not null,1,0) haveVote,\n" +
"u.image_url,\n" +
@@ -135,6 +136,7 @@
"select * from ("+
"SELECT\n" +
"u.`name` userName,\n" +
+ "u.`nick_name` userNickName,\n" +
"u.`image_url`,\n" +
"u.phone,\n" +
"c.`comment`,\n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index 70e9161..94da1b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -142,6 +142,7 @@
"p.examine_at,\n" +
"p.create_at,\n" +
"u.`name` sponsorName,\n" +
+ "u.`nick_name` userNickName,\n" +
"su.`name` handlerName,\n" +
"u.`image_url`,\n" +
"u.phone,\n" +
@@ -189,6 +190,7 @@
"SELECT\n" +
"p.id,\n" +
"u.`name` sponsor_name,\n" +
+ "u.`nick_name` userNickName,\n" +
"u.phone sponsor_phone,\n" +
"count(DISTINCT pu.id)giveThumbsUpNum,\n" +
"count(DISTINCT c.id)commentNum,\n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index eb85584..3240ae7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -26,6 +26,7 @@
"SELECT\n" +
"w.id,\n" +
"u.name sponsor_name,\n" +
+ "u.nick_name userNickName,\n" +
"u.image_url ,\n" +
"w.sponsor_phone,\n" +
"w.wish_name,\n" +
@@ -99,6 +100,7 @@
@Select("SELECT\n" +
"w.id,\n" +
"u.name sponsor_name,\n" +
+ "u.nick_name userNickName,\n" +
"w.create_at,\n" +
"u.image_url,\n" +
"w.sponsor_phone,\n" +
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 1637fba..330292c 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
@@ -479,8 +479,11 @@
}
Long userId = comActDiscussDO.getUserId();
LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId);
- comActDiscussVO.setUserName(loginUserInfoVO.getName());
- comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
+ if(loginUserInfoVO != null){
+ comActDiscussVO.setUserName(loginUserInfoVO.getName());
+ comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
+ comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
+ }
Long communityId = comActDiscussDO.getCommunityId();
Integer type1 = loginUserInfoVO.getType();
if (type1.intValue()>1) {
--
Gitblit v1.7.1