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

@@ -11,9 +11,11 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
 import com.ym.mec.biz.dal.dto.ImGroupNoticeDto;
 import com.ym.mec.biz.dal.entity.ImGroupNotice;
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
 import com.ym.mec.biz.dal.wrapper.ImGroupNoticeWrapper;
 import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -26,10 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -41,6 +40,8 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 	private ImPluginContext imPluginContext;
 	@Resource
 	private SysUserService sysUserService;
+	@Resource
+	private SysConfigService sysConfigService;
 
 	@Override
 	public BaseDAO<Long, ImGroupNotice> getDAO() {
@@ -59,6 +60,14 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = imGroupNoticeDao.queryForPage(params);
+			// 查询用户默认头象
+			String defaultAvatar = Optional.ofNullable(sysConfigService.findByParamName(SysConfigService.USER_DEFAULT_AVATAR))
+					.map(SysConfig::getParanValue).orElse("");
+			for (ImGroupNoticeDto imGroupNoticeDto : dataList) {
+				if(StringUtils.isEmpty(imGroupNoticeDto.getAvatar())){
+					imGroupNoticeDto.setAvatar(defaultAvatar);
+				}
+			}
 		}
 		if (count == 0) {
 			dataList = new ArrayList<ImGroupNoticeDto>();
@@ -73,6 +82,12 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
 		SysUser sysUser = sysUserService.queryUserById(imGroupNoticeDto.getOperatorId().intValue());
 		imGroupNoticeDto.setUsername(sysUser.getUsername());
 		imGroupNoticeDto.setAvatar(sysUser.getAvatar());
+		if(StringUtils.isEmpty(imGroupNoticeDto.getAvatar())){
+			// 查询用户默认头象
+			String defaultAvatar = Optional.ofNullable(sysConfigService.findByParamName(SysConfigService.USER_DEFAULT_AVATAR))
+					.map(SysConfig::getParanValue).orElse("");
+			imGroupNoticeDto.setAvatar(defaultAvatar);
+		}
 		return imGroupNoticeDto;
 	}