|
@ -2754,7 +2754,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
ui.setReleaseUserHeadPhoto(u.getHeadImgUrl()); |
|
|
ui.setReleaseUserHeadPhoto(u.getHeadImgUrl()); |
|
|
ui.setMobile(u.getMobile()); |
|
|
ui.setMobile(u.getMobile()); |
|
|
if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){ |
|
|
if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){ |
|
|
ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName()); |
|
|
ui.setReleaseUserName(u.getRealName()); |
|
|
}else { |
|
|
}else { |
|
|
if (StringUtils.isBlank(u.getGender())) { |
|
|
if (StringUtils.isBlank(u.getGender())) { |
|
|
//性别为空,默认为未知
|
|
|
//性别为空,默认为未知
|
|
@ -2777,7 +2777,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
} |
|
|
} |
|
|
String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR; |
|
|
String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR; |
|
|
if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) { |
|
|
if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) { |
|
|
ui.setReleaseUserName(u.getStreet().concat("-").concat(name)); |
|
|
ui.setReleaseUserName(name); |
|
|
} else { |
|
|
} else { |
|
|
log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId())); |
|
|
log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId())); |
|
|
ui.setReleaseUserName(u.getNickname()); |
|
|
ui.setReleaseUserName(u.getNickname()); |
|
|