Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-12-10 17:15:02 +08:00

View File

@@ -74,7 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ( from (
select cm.*,mc.cr_teacher_no,case when mc.cr_no is NULL then '0' else '1' end as is_complate select cm.*,mc.cr_teacher_no,case when mc.cr_no is NULL then '0' else '1' end as is_complate
from rt_class_metting_theme cm from rt_class_metting_theme cm
left join rt_class_metting_content mc on cm.cm_no=mc.cr_cm_no and mc.cr_teacher_no= #{userName} ) temp left join rt_class_metting_content mc on cm.cm_no=mc.cr_cm_no and mc.cr_class_no in (
select class_id from srs_class sc
left join cph_teacher ct on sc.teacher_id = ct.teacher_id
where ct.employee_id = #{userName}
) ) temp
<where> <where>
<!--<if test="userName != null and userName != ''"> temp.rc_teacher_no= #{userName}</if>--> <!--<if test="userName != null and userName != ''"> temp.rc_teacher_no= #{userName}</if>-->
<if test="isComplate != null and isComplate != ''"> temp.is_complate=#{isComplate}</if> <if test="isComplate != null and isComplate != ''"> temp.is_complate=#{isComplate}</if>