--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/publiclesson/FgPublicBasicRelationMapper.java

@@ -103,6 +103,12 @@ public interface FgPublicBasicRelationMapper extends BaseMapper<PublicBasicRelat
 		    + " <if test = '" + NOTBLANK + "(query.type)'> "  
 		    + " and s.type =  #{query.type} "
 		    + " </if> "
+		    + " <if test = ' query.academicLevel != null '> "  
+		    + " and s.academicLevel =  #{query.academicLevel} "
+		    + " </if> "
+		    + " <if test = ' query.majorId != null '> "  
+		    + " and s.majorId =  #{query.majorId} "
+		    + " </if> "
 			+ " </script> ")
 	List<RecommendPlanVo> listPlan(@Param("query") QueryAcademicLevelForm form);