zouxuan 5 lat temu
rodzic
commit
b90ebc7524

+ 4 - 3
mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -724,13 +724,14 @@
         WHEN cgsm.status_ = 'QUIT_SCHOOL' THEN '休学' ELSE NULL END) vip_group_status_,
         GROUP_CONCAT(DISTINCT o.name_) organ_name_,
         GROUP_CONCAT(DISTINCT s.name_) music_group_subject_,
-        CASE WHEN GROUP_CONCAT(DISTINCT cssp.id_) IS NULL THEN 0 ELSE 1 END hasCourse_,
+        CASE WHEN GROUP_CONCAT(DISTINCT cs.id_) IS NULL THEN 0 ELSE 1 END hasCourse_,
         CASE WHEN GROUP_CONCAT(DISTINCT pla.id_) IS NULL THEN 0 ELSE 1 END isMake_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         CASE WHEN GROUP_CONCAT(DISTINCT cssp1.id_) IS NULL THEN 0 ELSE 1 END hasPracticeCourse_,
         suca.balance_
         FROM sys_user su
         LEFT JOIN course_schedule_student_payment cssp ON su.id_ = cssp.user_id_
+        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_ AND cs.status_ != 'OVER'
         LEFT JOIN music_group mg ON cssp.music_group_id_ = mg.id_ AND cssp.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON cssp.music_group_id_ = vg.id_ AND cssp.group_type_ = 'VIP'
         LEFT JOIN organization o ON su.organ_id_ = o.id_
@@ -748,10 +749,10 @@
             AND cssp1.id_ IS NULL
         </if>
         <if test="hasCourse != null and hasCourse == true">
-            AND cssp.id_ IS NOT NULL
+            AND cs.id_ IS NOT NULL
         </if>
         <if test="hasCourse != null and hasCourse == false">
-            AND cssp.id_ IS NULL
+            AND cs.id_ IS NULL
         </if>
         <if test="isActive != null and isActive == true">
             AND su.password_ IS NOT NULL