Merge remote-tracking branch 'origin/dev_bug_group_member_name' into dev

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2686,7 +2686,19 @@ 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;
+                        break;
+                    case NumConstant.TWO_STR:
+                        gender = ModuleConstant.GENDER_TWO;
+                        break;
+                    default:
+                        gender = ModuleConstant.GENDER_NO;
+                }
+                String name = u.getSurname().concat(gender);
+                ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
             }
             result.add(ui);
         });

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 = "先生/女士";
+
 }