Merge remote-tracking branch 'origin/dev'

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,8 +2685,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {
+                if (StringUtils.isBlank(u.getGender())) {
+                    //性别为空，默认为未知
+                    u.setGender(NumConstant.ZERO_STR);
+                }
                 String gender = ModuleConstant.GENDER_NO;
-                switch (u.getGender()){
+                switch (u.getGender()) {
                     case NumConstant.ONE_STR:
                         gender = ModuleConstant.GENDER_ONE;
                         break;
@@ -2697,8 +2700,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     default:
                         gender = ModuleConstant.GENDER_NO;
                 }
-                String name = u.getSurname().concat(gender);
-                ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
+                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);
         });