移动端接口：招聘方【收藏简历】查询接口增加查询条件

common/src/main/resources/mapper/job/RecruitmentCollection.xml

@@ -133,14 +133,18 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			jobstaw.name_  jobStatus,
 			drmoneyw.name_ dreamMoney,
 			c.update_time collectionTime,
-			c.del_flag
+			c.del_flag,
+			r.education_,
+			r.work_exp,
+			r.dream_money,
+			r.job_status
 			from job_recruitment_collection  c inner join job_resume  r on c.resume_id=r.id_
 			inner join job_jobuser ju on r.job_user_id=ju.id_ and ju.del_flag=0
 			left join job_work_category w on r.position_category_id=w.id_ and w.del_flag=0
 			left join sys_data_dictionary workExpw on r.work_exp=workExpw.id_ and workExpw.del_flag=0  
 			left join sys_data_dictionary eduw on r.education_=eduw.id_ and eduw.del_flag=0 
 			left join sys_data_dictionary sexw on r.sex_=sexw.id_ and sexw.del_flag=0  
-			left join sys_data_dictionary jobstaw on ju.job_status=jobstaw.id_ and jobstaw.del_flag=0  
+			left join sys_data_dictionary jobstaw on r.job_status=jobstaw.id_ and jobstaw.del_flag=0  
 			left join sys_data_dictionary drmoneyw on r.dream_money=drmoneyw.id_ and drmoneyw.del_flag=0  
 			) tab
 		]]>
@@ -148,9 +152,22 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			<if test="1==1">
 				and del_flag=0 and hrId = #{searchParams.recruiterId}
 			</if>
-			<if test="searchParams.positionName != null">
+			<if test="searchParams.positionName != null and searchParams.positionName !=''">
 				and positionCategoryName like #{searchParams.positionName}
 			</if>
+			<if test="searchParams.education != null and searchParams.education != ''">
+				and education_ = #{searchParams.education}
+			</if>
+			<if test="searchParams.workExp != null and searchParams.workExp !='' ">
+				and work_exp = #{searchParams.workExp}
+			</if>
+			
+			<if test="searchParams.dreamMoney != null and searchParams.dreamMoney !=''">
+				and dream_money = #{searchParams.dreamMoney}
+			</if>
+			<if test="searchParams.jobStatus != null and searchParams.jobStatus != ''">
+				and job_status = #{searchParams.jobStatus}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}
@@ -197,7 +214,7 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			<if test="1==1">
 				<![CDATA[ and del_flag=0  and (chat_status is null or chat_status <>'5') ]]>  <!--非已入职的简历sys_data_dictionary where parent_id=5e048b6d-cb1d-4fd5-bc70-c94259960862-->
 			</if>
-			<if test="searchParams.positionName != null">
+			<if test="searchParams.positionName != null and searchParams.positionName !=''">
 				and positionCategoryName like #{searchParams.positionName}
 			</if>
 		</where>