Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -2525,19 +2525,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
             }
 
-            List<Integer> classGroupIds = new ArrayList<>();
-            classGroupIds.add(classGroupId);
-            // 删除历史记录
-            classGroupTeacherMapperService.getDao().delClassGroupTeacherMapper(classGroupIds);
-            for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
-                tm.setClassGroupId(classGroupId);
-                tm.setCreateTime(date);
-                tm.setGroupType(GroupType.MUSIC);
-                tm.setMusicGroupId(musicGroupId);
-                tm.setUpdateTime(date);
-                classGroupTeacherMapperService.getDao().insert(tm);
-            }
-            imUserFriendService.refreshClassImUserFriend(classGroupId);
             // 通知学校端
             for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
                 if (CollectionUtils.isEmpty(classGroup4MixDto.getClassGroupTeacherMapperList())) {
@@ -2554,6 +2541,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
 
 
+            List<Integer> classGroupIds = new ArrayList<>();
+            classGroupIds.add(classGroupId);
+            // 删除历史记录
+            classGroupTeacherMapperService.getDao().delClassGroupTeacherMapper(classGroupIds);
+            for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
+                tm.setClassGroupId(classGroupId);
+                tm.setCreateTime(date);
+                tm.setGroupType(GroupType.MUSIC);
+                tm.setMusicGroupId(musicGroupId);
+                tm.setUpdateTime(date);
+                classGroupTeacherMapperService.getDao().insert(tm);
+            }
+            imUserFriendService.refreshClassImUserFriend(classGroupId);
+
+
             return BaseController.succeed(classGroup);
         }
         if (classGroup4MixDtos.get(0).getCourseTimes().compareTo(0) <= 0) {

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -193,7 +193,7 @@
 
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
-		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		WHERE user_id_ = #{userId} AND read_status_ = 0
         <if test="tenantId != null">
             AND tenant_id_ = #{tenantId}
         </if>