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

src/main/resources/mapper/base/BaseClassCourse.xml

@@ -25,15 +25,15 @@
         <if test="dto.deptId != null">
             and t4.id = #{dto.deptId}
         </if>
-        <if test="dto.semester != null">
-            AND EXISTS (
-            SELECT 1
-            FROM base_class_course bcc
-            JOIN textbook tb ON bcc.textbook_id = tb.id
-            WHERE bcc.class_id = t.id
-            AND tb.base_semester_id = #{dto.semester}
-            )
-        </if>
+<!--  关联学期      <if test="dto.semester != null">-->
+<!--            AND EXISTS (-->
+<!--            SELECT 1-->
+<!--            FROM base_class_course bcc-->
+<!--            JOIN textbook tb ON bcc.textbook_id = tb.id-->
+<!--            WHERE bcc.class_id = t.id-->
+<!--            AND tb.base_semester_id = #{dto.semester}-->
+<!--            )-->
+<!--        </if>-->
         GROUP BY t.id, t.name, t1.name, t3.name, t4.name
         <if test="dto.courseSet == 1">
             HAVING LENGTH(course_name) > 0