@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSyMajorByPlan" resultMap="SyMajorResult">
SELECT mp.id, m.`type`, m.`code`, CONCAT(m.`name`, IF(mp.`majorDirection` = '', '', CONCAT('(', mp.`majorDirection`, ')'))) `name`, CONCAT(m2.`name`, '>', m1.`name`) `ancestors`
FROM `a_marjor_plan` mp
- JOIN `sy_major` m ON mp.`majorName` = m.`name` AND mp.`level` = m.`type` AND mp.`examineeType` = m.`exam_type`
+ JOIN `sy_major` m ON mp.`majorName` = m.`name` AND mp.`level` = m.`type` AND IF(mp.`examineeType` = '职高对口升学', '职高对口升学', '单招(应届普高)') = m.`exam_type`
LEFT JOIN `sy_major` m1 ON m1.`code` = m.`parent_code` AND m1.`exam_type` = m.`exam_type` AND m1.type = m.type AND m1.level + 1 = m.level
LEFT JOIN `sy_major` m2 ON m2.`code` = m1.`parent_code` AND m1.`exam_type` = m.`exam_type` AND m2.type = m1.type AND m2.level + 1 = m1.level
WHERE mp.`year` = #{year} AND mp.`examineeType` = #{examType} AND mp.`universityId` = #{universityId} AND mp.`location` = #{location}