dzx 1 місяць тому
батько
коміт
863fd683db

+ 1 - 1
src/main/resources/mapper/banding/BandingTaskMajorConditionMapper.xml

@@ -7,7 +7,7 @@
             resultType="com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo">
         SELECT t1.id, t.id AS major_set_id, t.name AS major_set_name,t1.banding_task_id,t1.height,t1.score, t1.sort_code FROM base_major_set t
         LEFT JOIN banding_task_major_condition t1 ON t1.major_set_id = t.id and t1.banding_task_id = #{dto.bandingTaskId} and t1.delete_mark = 0
-        WHERE t.delete_mark = 0
+        WHERE t.delete_mark = 0 and t.enabled_mark = 1
         <if test="dto.majorIds != null and !dto.majorIds.isEmpty()">
             and t.id in
             <foreach item="id" index="index" collection="dto.majorIds" open="(" close=")" separator=",">

+ 1 - 1
src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -300,7 +300,7 @@
         ) AS female_count FROM base_major_set t1
         LEFT JOIN banding_task_major_condition t2 ON t1.id = t2.major_set_id AND t2.banding_task_id = #{id}
         AND t2.delete_mark = 0
-        WHERE t1.delete_mark = 0
+        WHERE t1.delete_mark = 0 and t1.enabled_mark = 1
     </select>
 
 </mapper>

+ 1 - 1
src/main/resources/mapper/student/EnrollmentPlanMajorSetMapper.xml

@@ -23,7 +23,7 @@
         from base_major_set t
         left join base_major_gradation t3 on t3.id = t.major_gradation_id
         left join xjr_department t4 on t4.id = t.department_id
-        where t.delete_mark = 0
+        where t.delete_mark = 0 and t.enabled_mark = 1
         <if test="dto.name != null and dto.name != ''">
             and t.name like concat('%', #{dto.name}, '%')
         </if>