Merge branch 'zx_saas_0906' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupNoticeServiceImpl.java

@@ -80,7 +80,7 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 	public ImGroupNoticeDto queryLatestNotice(String imGroupId) {
 		ImGroupNoticeDto imGroupNoticeDto = imGroupNoticeDao.queryLatestNotice(imGroupId);
 		SysUser sysUser = sysUserService.queryUserById(imGroupNoticeDto.getOperatorId().intValue());
-		imGroupNoticeDto.setUsername(sysUser.getUsername());
+		imGroupNoticeDto.setUsername(StringUtils.isEmpty(sysUser.getRealName())?sysUser.getUsername():sysUser.getRealName());
 		imGroupNoticeDto.setAvatar(sysUser.getAvatar());
 		if(StringUtils.isEmpty(imGroupNoticeDto.getAvatar())){
 			// 查询用户默认头象
@@ -159,8 +159,14 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 		}
 		ImGroupNoticeDto noticeDto = JSON.parseObject(JSON.toJSONString(notice), ImGroupNoticeDto.class);
 		SysUser sysUser = sysUserService.queryUserById(noticeDto.getOperatorId().intValue());
-		noticeDto.setUsername(sysUser.getRealName());
+		noticeDto.setUsername(StringUtils.isEmpty(sysUser.getRealName())?sysUser.getUsername():sysUser.getRealName());
 		noticeDto.setAvatar(sysUser.getAvatar());
+		if(StringUtils.isEmpty(noticeDto.getAvatar())){
+			// 查询用户默认头象
+			String defaultAvatar = Optional.ofNullable(sysConfigService.findByParamName(SysConfigService.USER_DEFAULT_AVATAR))
+					.map(SysConfig::getParanValue).orElse("");
+			noticeDto.setAvatar(defaultAvatar);
+		}
 		return noticeDto;
 	}