jinxia.mo il y a 3 semaines
Parent
commit
7981ebab42

+ 1 - 1
ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontSyMajorRelationController.java

@@ -295,7 +295,7 @@ public class FrontSyMajorRelationController extends BaseController {
             query.setType(batch >= 4 ? "专科" : "本科");
         }
         String examTypeData = ConstantUtil.getExamTypeData(user.getExamType().title());
-        query.setExamType(examTypeData);
+//        query.setExamType(examTypeData);
         List<SyMajor> majorList = syMajorService.selectSyMajorList(query).stream().filter(major->major.getLevel()>level).collect(Collectors.toList());
         List<TreeSelectVocational> resultList = new ArrayList<>();
 

+ 4 - 1
ie-system/src/main/resources/mapper/sy/SyMajorOverviewMapper.xml

@@ -105,7 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectSyMajorOverviewByCode" resultMap="SyMajorOverviewResult">
         <include refid="selectSyMajorOverviewVo"/>
-        where exam_type = #{examType} and code = #{code}
+        where 1=1
+        <if test="code != null and code != ''"> and code = #{code}</if>
+        <if test="examType != null  and examType != ''"> and exam_type = #{examType}</if>
+<!--        exam_type = #{examType} and code = #{code}-->
     </select>
 
     <select id="selectSyMajorOverviewByCodes" resultMap="SyMajorOverviewResult">