Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-15 579e16edf3640235bc11934f58b4680ab809582a

 src/main/resources/mapper/SubjectMapper.xml

@@ -116,7 +116,7 @@

    <select id="allSubject" resultMap="BaseResultMap">
        select
        ts.id, ts.name
        DISTINCT ts.id, ts.name
        from t_subject ts
        <if test="admin == false and deptIds != null and deptIds.size > 0">
            INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id