From 27c525f02657b18aee560ad137c0463d632c2bc8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 17 May 2021 15:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=91=98=E5=90=8D=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/service/impl/ResiTopicServiceImpl.java     | 12 +++++++++++-
 .../java/com/epmet/modules/utils/ModuleConstant.java |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 6c4ff65b4f..a3f70188a2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -2686,7 +2686,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {
-                ui.setReleaseUserName(u.getShowName());
+                String gender = ModuleConstant.GENDER_NO;
+                switch (u.getGender()){
+                    case NumConstant.ONE_STR:
+                        gender = ModuleConstant.GENDER_ONE;
+                    case NumConstant.TWO_STR:
+                        gender = ModuleConstant.GENDER_TWO;
+                    default:
+                        gender = ModuleConstant.GENDER_NO;
+                }
+                String name = u.getSurname().concat(gender);
+                ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
             }
             result.add(ui);
         });
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index e2a219f6e9..fe83052205 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -405,4 +405,8 @@ public interface ModuleConstant extends Constant {
 
 	String GET_BADGE_INFO_ERR = "获取徽章信息失败了";
 
+	String GENDER_ONE = "先生";
+	String GENDER_TWO = "女士";
+	String GENDER_NO = "先生/女士";
+
 }