Merge branch 'pre'

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassServiceImpl.java

@@ -253,7 +253,7 @@ public class BaseClassServiceImpl extends MPJBaseServiceImpl<BaseClassMapper, Ba
                 }
             }
 
-            if(baseClass.getTeacherId() == null && aClass.getTeacherId() != null){
+            if((baseClass.getTeacherId() == null && aClass.getTeacherId() != null) || (baseClass.getIsGraduate() != null && baseClass.getIsGraduate() == 2)){
                 long count = this.count(
                         new QueryWrapper<BaseClass>().lambda()
                                 .eq(BaseClass::getIsGraduate, 1)

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -220,7 +220,10 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     public CourseTableVo getList(CourseTableDto dto) {
 
         List<ClassTime> classTimes = classTimeMapper.selectList(
-                new QueryWrapper<ClassTime>().lambda().orderByAsc(ClassTime::getSummerStartTime)
+                new QueryWrapper<ClassTime>().lambda()
+                        .ne(ClassTime::getTimePeriod, 0)
+                        .orderByAsc(ClassTime::getSummerStartTime)
+
         );
 
         CourseTableVo tableVo = new CourseTableVo();