Merge branch 'zx_saas_homework' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -108,15 +108,14 @@ public class TeacherCourseScheduleController extends BaseController {
                             continue;
                         }
                         if(StringUtils.equals(lessonCourseware.getTeacherRangeType(),"ALL")){
-                            courseScheduleDto.setCoursewareEnable(true);
                             continue;
                         }
                         LessonCoursewareUserMapper lessonCoursewareUserMapper = lessonCoursewareUserMapperService.lambdaQuery()
                                 .eq(LessonCoursewareUserMapper::getLessonCoursewareId, lessonCourseware.getId())
                                 .eq(LessonCoursewareUserMapper::getUserType, "TEACHER")
                                 .eq(LessonCoursewareUserMapper::getUserId, user.getId()).last("LIMIT 1").one();
-                        if(Objects.nonNull(lessonCoursewareUserMapper)){
-                            courseScheduleDto.setCoursewareEnable(true);
+                        if(Objects.isNull(lessonCoursewareUserMapper)){
+                            courseScheduleDto.setCoursewareEnable(false);
                         }
                     }
                 }
@@ -154,8 +153,8 @@ public class TeacherCourseScheduleController extends BaseController {
                             .eq(LessonCoursewareUserMapper::getLessonCoursewareId, lessonCourseware.getId())
                             .eq(LessonCoursewareUserMapper::getUserType, "TEACHER")
                             .eq(LessonCoursewareUserMapper::getUserId, sysUserService.getUserId()).last("LIMIT 1").one();
-                    if(Objects.nonNull(lessonCoursewareUserMapper)){
-                        courseScheduleDto.setCoursewareEnable(true);
+                    if(Objects.isNull(lessonCoursewareUserMapper)){
+                        courseScheduleDto.setCoursewareEnable(false);
                     }
                 }
             }

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

@@ -227,7 +227,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     }
 
 
-    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public HttpResponseResult updateLiveGroup(VipGroupApplyDto vipGroup) {
         VipGroupApplyBaseInfoDto applyBaseInfo = vipGroup.getVipGroupApplyBaseInfo();