update

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

@@ -651,20 +651,24 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(!CollectionUtils.isEmpty(needCreateCourseScheduleTeacherSalaryCourse)){
 			classGroupTeacherMapperService.createCourseScheduleTeacherSalary(needCreateCourseScheduleTeacherSalaryCourse,oldCourseSchedules);
 		}
-		//推送课时调整
-		Set<Integer> teacherIds = newCourseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
-		if(teacherIds == null){
-			teacherIds = new HashSet<>();
-		}
-		teacherIds.addAll(oldCourseScheduleList.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet()));
-		Map<Integer,String> map = new HashMap<>(teacherIds.size());
-		teacherIds.forEach(e->{
-			map.put(e,e.toString());
-		});
+		try {
+			//推送课时调整
+			Set<Integer> teacherIds = newCourseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
+			if(teacherIds == null){
+				teacherIds = new HashSet<>();
+			}
+			teacherIds.addAll(oldCourseScheduleList.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet()));
+			Map<Integer,String> map = new HashMap<>(teacherIds.size());
+			teacherIds.forEach(e->{
+				map.put(e,e.toString());
+			});
 //		HashMap<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(teacherIds, ",")))), HashMap.class);
-		if(map != null && map.size() > 0){
-			sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
-					map,null,0,"7");
+			if(map != null && map.size() > 0){
+				sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
+						map,null,0,"7");
+			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 //		Set<Integer> roleIds = new HashSet<>(1);
 //		roleIds.add(SysUserRole.SECTION_MANAGER);

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

@@ -124,6 +124,6 @@
         select * from school where del_flag_ = 0 and user_id_ = #{userId}
     </select>
     <select id="findVipSchoolByUserId" resultMap="School">
-        select * from school where del_flag_ = 0 and (user_id_ = #{userId} OR user_id_ IS NULL)
+        select * from school where del_flag_ = 0 and (user_id_ IS NULL OR user_id_ = #{userId})
     </select>
 </mapper>