From ef37c8214141610df72511ac9c0e5aa387a029d8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 May 2021 12:28:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

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 2f312ea589..1c547020de 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
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -55,7 +56,6 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.constant.WxmpSubscribeConstant;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovIssueFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -118,7 +118,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotBlank;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -2686,19 +2685,30 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {
-                String gender = ModuleConstant.GENDER_NO;
-                switch (u.getGender()){
-                    case NumConstant.ONE_STR:
-                        gender = ModuleConstant.GENDER_ONE;
-                        break;
-                    case NumConstant.TWO_STR:
-                        gender = ModuleConstant.GENDER_TWO;
-                        break;
-                    default:
-                        gender = ModuleConstant.GENDER_NO;
+                if(StringUtils.isNotBlank(u.getGender())){
+                    String gender = ModuleConstant.GENDER_NO;
+                    switch (u.getGender()){
+                        case NumConstant.ONE_STR:
+                            gender = ModuleConstant.GENDER_ONE;
+                            break;
+                        case NumConstant.TWO_STR:
+                            gender = ModuleConstant.GENDER_TWO;
+                            break;
+                        default:
+                            gender = ModuleConstant.GENDER_NO;
+                    }
+                    String name = StrConstant.EPMETY_STR;
+                    if (StringUtils.isNotBlank(u.getSurname())) {
+                        name = u.getSurname().concat(gender);
+                    }
+                    String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR;
+                    if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) {
+                        ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
+                    } else {
+                        log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId()));
+                        ui.setReleaseUserName(u.getNickname());
+                    }
                 }
-                String name = u.getSurname().concat(gender);
-                ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
             }
             result.add(ui);
         });

From bce5879b5a0a3fdc27c0d3702154d43aefb12a31 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 May 2021 12:31:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

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 1c547020de..3e11e5677f 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
@@ -2685,29 +2685,31 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {
-                if(StringUtils.isNotBlank(u.getGender())){
-                    String gender = ModuleConstant.GENDER_NO;
-                    switch (u.getGender()){
-                        case NumConstant.ONE_STR:
-                            gender = ModuleConstant.GENDER_ONE;
-                            break;
-                        case NumConstant.TWO_STR:
-                            gender = ModuleConstant.GENDER_TWO;
-                            break;
-                        default:
-                            gender = ModuleConstant.GENDER_NO;
-                    }
-                    String name = StrConstant.EPMETY_STR;
-                    if (StringUtils.isNotBlank(u.getSurname())) {
-                        name = u.getSurname().concat(gender);
-                    }
-                    String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR;
-                    if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) {
-                        ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
-                    } else {
-                        log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId()));
-                        ui.setReleaseUserName(u.getNickname());
-                    }
+                if (StringUtils.isBlank(u.getGender())) {
+                    //性别为空，默认为未知
+                    u.setGender(NumConstant.ZERO_STR);
+                }
+                String gender = ModuleConstant.GENDER_NO;
+                switch (u.getGender()) {
+                    case NumConstant.ONE_STR:
+                        gender = ModuleConstant.GENDER_ONE;
+                        break;
+                    case NumConstant.TWO_STR:
+                        gender = ModuleConstant.GENDER_TWO;
+                        break;
+                    default:
+                        gender = ModuleConstant.GENDER_NO;
+                }
+                String name = StrConstant.EPMETY_STR;
+                if (StringUtils.isNotBlank(u.getSurname())) {
+                    name = u.getSurname().concat(gender);
+                }
+                String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR;
+                if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) {
+                    ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
+                } else {
+                    log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId()));
+                    ui.setReleaseUserName(u.getNickname());
                 }
             }
             result.add(ui);