he2802 1 tahun lalu
induk
melakukan
327c2d2499

+ 25 - 16
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1528,27 +1528,36 @@
     </select>
 
     <select id="findChapterList" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="CourseChapterResultVo">
-        SELECT
-            cc.chapter_id,
-            cc.`name`
+        SELECT ui.* from (SELECT
+        cc.chapter_id,
+        cc.`name`,
+        m.sort
         FROM
-            course_module_chapter p
-                LEFT JOIN course_chapter cc ON p.chapter_id = cc.chapter_id
-                LEFT JOIN course_menu m ON m.menu_id = p.module_id
-                LEFT JOIN goods_course gc ON gc.course_id = m.course_id
+        course_module_chapter p
+        LEFT JOIN course_chapter cc ON p.chapter_id = cc.chapter_id
+        LEFT JOIN course_menu m ON m.menu_id = p.module_id
+        LEFT JOIN goods_course gc ON gc.course_id = m.course_id
         WHERE
-            gc.goods_id = #{goodsId}
-          AND m.type =  1  UNION
+        gc.goods_id = #{goodsId}
+        <if test="moduleId != null and moreCertificateStatus == 2 ">
+            AND p.module_id = #{moduleId}
+        </if>
+        AND m.type =  1 UNION
         SELECT
-            cc.chapter_id,
-            cc.`name`
+        cc.chapter_id,
+        cc.`name`,
+        m.sort
         FROM
-            course_menu m
-                LEFT JOIN course_chapter cc ON m.menu_id = cc.chapter_id
-                LEFT JOIN goods_course gc ON gc.course_id = m.course_id
+        course_menu m
+        LEFT JOIN course_chapter cc ON m.menu_id = cc.chapter_id
+        LEFT JOIN goods_course gc ON gc.course_id = m.course_id
         WHERE
-            gc.goods_id = #{goodsId}
-          AND m.type =  2
+        gc.goods_id = #{goodsId}
+        <if test="moduleId != null and moreCertificateStatus == 2 ">
+            AND 1 = 0
+        </if>
+        AND m.type =  2)ui
+        ORDER BY ui.sort
     </select>
 
     <select id="selectOfficialInfoCount" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="long">