diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml
index 2665b82..b12efb0 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml
@@ -143,6 +143,11 @@
) latest_ii on latest_ii.user_id = a.user_id
and latest_ii.job_id = a.job_id
and latest_ii.del_flag = '0'
+ LEFT JOIN (
+ SELECT
+ user_id, MAX(school_name) AS school_name, MAX(end_time) AS end_time
+ FROM app_user_education WHERE del_flag = '0' GROUP BY user_id
+ ) edu ON e.user_id = edu.user_id
where a.del_flag='0'
and e.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%')
@@ -150,16 +155,32 @@
and e.phone like concat('%', cast(#{phone, jdbcType=VARCHAR} as varchar), '%')
and e.education = #{education}
+
+ and e.work_experience = #{workExperience}
+
+ and e.update_time >= #{finishTime}
and e.sex = #{sex}
+
+ and e.nation = #{nation}
+
+ and e.user_type like concat('%', cast(#{userType, jdbcType=VARCHAR} as varchar), '%')
+
+ and e.job_title_id like concat('%', cast(#{jobTitleId, jdbcType=VARCHAR} as varchar), '%')
and e.area = #{area}
+
+ and get_age_from_id_card(e.id_card) = #{age}
and e.political_affiliation = #{politicalAffiliation}
and e.id_card like concat('%', cast(#{idCard, jdbcType=VARCHAR} as varchar), '%')
and e.birth_date = #{birthDate}
+
+ and edu.school_name = #{schoolName}
+
+ and edu.end_time = #{endTime}
and b.job_title like concat('%', cast(#{jobName, jdbcType=VARCHAR} as varchar), '%')