bug修复

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -37,7 +37,7 @@
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name},'%')
         </if>
-        <if test="dto.name != null and dto.name != ''">
+        <if test="dto.majorSetName != null and dto.majorSetName != ''">
             and t2.name like concat('%', #{dto.majorSetName},'%')
         </if>
         ORDER BY t1.sort_code IS NULL, t1.sort_code ASC

src/main/resources/mapper/banding/BandingTaskMajorConditionMapper.xml

@@ -9,13 +9,13 @@
         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
         <if test="dto.majorIds != null and !dto.majorIds.isEmpty()">
-            and t1.major_set_id in
+            and t.id in
             <foreach item="id" index="index" collection="dto.majorIds" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
         <if test="dto.majorSetName != null and dto.majorSetName != ''">
-            and t.name like concat('', #{dto.majorSetName},'')
+            and t.name like concat('%', #{dto.majorSetName},'%')
         </if>
     </select>
     <select id="getStudentMajorId" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassPageDto" resultType="com.xjrsoft.module.student.entity.BaseNewStudent">