shangke 2 سال پیش
والد
کامیت
9e16564490

+ 5 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolStaffServiceImpl.java

@@ -253,10 +253,11 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
             throw new BizException("加入群组失败");
         }
 
-         CompletableFuture.runAsync(() -> {
+        // 创建学校员工IM好友
+        imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
 
-             // 创建学校im好友
-             imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
+        // 异步添加乐团领队到其他乐团群
+         CompletableFuture.runAsync(() -> {
 
              if (schoolStaff.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
                  addMusicGroup(schoolStaff, user);
@@ -267,9 +268,6 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         redissonClient.getBucket(submitLockKey).delete();
 
         // 消息推送
-
-        // 推送给自己
-
         Map<Integer, String> userMap = new HashMap<>();
         userMap.put(user.getId(), user.getId().toString());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_SCHOOL_ACCOUNT_REGISTER_NOTICE,
@@ -304,6 +302,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_SCHOOL_ACCOUNT_REGISTER,
                 selfMap, null, 0, null,
                 "SCHOOL",cooperation.getName(),schoolStaff.getUserType().getDescribe(),url);
+
         return true;
     }
 

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/SchoolStaffMapper.xml

@@ -55,7 +55,7 @@
 	<!--学校员工身份数统计-->
 	<select id="selectUserTypeNumsStat" resultType="com.ym.mec.biz.dal.wrapper.StatGroupWrapper">
 		SELECT t1.user_type_ AS gid, COUNT(t1.user_id_) AS total
-		FROM school_staff t1 WHERE t1.school_id_ = #{schoolId} GROUP BY t1.user_type_
+		FROM school_staff t1 WHERE t1.school_id_ = #{schoolId} AND t1.status_ = 1 GROUP BY t1.user_type_
 	</select>
 
     <update id="updateStatusAndRecoveryStatus">