Merge remote-tracking branch 'origin/master'

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

@@ -192,13 +192,12 @@
 			  jj.head_image_url headImage,
 			  jre.id_ id,
 			  su.id_ sysUseId,
-			  jub.create_time as create_time
 			FROM
 			  job_user_browse jub
 			INNER JOIN job_recruitment jr ON jub.job_recruitment_id = jr.id_
 			INNER JOIN sys_user su ON jr.company_id = su.company_id
 			INNER JOIN job_jobuser jj ON jub.job_user_id = jj.id_
-			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id on jre.approve_status=2
+			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id
 		]]>
 		<where>
 			<if test="searchParams.id != null">

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

@@ -198,6 +198,7 @@
 			  year(now())-year(jre.birthday_)  age,
 			  sddd.name_ workExp,
 			  sdde.name_ education,
+			  sddf.name_ dreamAdd,
 			  jj.head_image_url headImage,
 			  jj.real_name name,
 			  jre.id_ resumeId,
@@ -212,6 +213,7 @@
 			LEFT JOIN sys_data_dictionary sddb ON jre.job_status = sddb.id_
 			LEFT JOIN sys_data_dictionary sddd ON jre.work_exp = sddd.id_
 			LEFT JOIN sys_data_dictionary sdde ON jre.education_ = sdde.id_
+			LEFT JOIN sys_data_dictionary sddf ON jre.dream_add = sddf.id_
 			LEFT JOIN job_jobuser jj ON jre.job_user_id = jj.id_
 			LEFT JOIN job_resume_deliver jrd ON jre.id_ = jrd.job_resume_id
 			LEFT JOIN job_recruitment jr ON jrd.job_recruitment_id = jr.id_
@@ -224,6 +226,9 @@
 			<if test="searchParams.type != null">
 				and jre.approve_status = #{searchParams.type}
 			</if>
+			<if test="searchParams.type = null">
+				and jre.approve_status > 0
+			</if>
 			<if test="searchParams.sex != null">
 				and jre.sex_ = #{searchParams.sex}
 			</if>

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruiterApiController.java

@@ -303,7 +303,9 @@ public class RecruiterApiController {
             searchParams.put("id","%" + id + "%");
         }
 
-        searchParams.put("type",type);
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("type",type);
+        }
 
         Page<Map> page = resumeService.foundJobManagement(searchParams,pageIndex,pageSize,true,sortList);