Merge branch 'feature/0427-school' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -417,6 +417,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     // 微信公众号secret
     String WECHAT_SECRET = "wechat_secret";
 
+    // 微信公众号secret
+    String SCHOOL_IM_GROUP_IMG = "school_im_group_img";
 
     static void checkActivityDate(String startTimeStr, String endTimeStr) {
         if(StringUtils.isEmpty(startTimeStr) || StringUtils.isEmpty(startTimeStr)){

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

@@ -377,6 +377,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setIntroduce(imGroup.getName());
             imGroup.setMemo(cooperationOrgan.getName());
             imGroup.setMemberNum(0);
+            imGroup.setImg(sysConfigService.findByParamName(SysConfigService.SCHOOL_IM_GROUP_IMG).getParanValue());
             imGroup.setType(ImGroup.GroupTypeEnum.SCHOOL.getCode());
             imGroup.setGroupType(ImGroup.GroupTypeEnum.SCHOOL);
             imGroup.setCreateTime(new Date());

mec-web/src/main/java/com/ym/mec/web/controller/SchoolMessageController.java

@@ -86,6 +86,6 @@ public class SchoolMessageController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(sysMessageService.queryCountOfUnread(null, sysUser.getId(),"SCHOOL", null));
+        return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SCHOOL", null));
     }
 }