xiangpei
2024-07-16 f33f56fb2ebfea915b93467698ca6b243ee934ba
src/main/resources/mapper/SubjectMapper.xml
@@ -116,9 +116,9 @@
    <select id="allSubject" resultMap="BaseResultMap">
        select
        ts.id, ts.name
        DISTINCT ts.id, ts.name
        from t_subject ts
        <if test="deptIds != null and deptIds.size > 0">
        <if test="admin == false and deptIds != null and deptIds.size > 0">
            INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id
            AND tsd.dept_id IN
            <foreach collection="deptIds" open="(" separator="," close=")" item="deptId">#{deptId}</foreach>
@@ -126,6 +126,16 @@
        where ts.deleted = 0
    </select>
    <select id="listByDeptId" resultMap="BaseResultMap">
        select ts.id,
               ts.name
        from t_subject ts
                 INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id
            AND tsd.dept_id = #{deptId}
        where ts.deleted = 0
    </select>
    <select id="page" resultMap="BaseResultMap"
            parameterType="com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM">
        SELECT