Merge remote-tracking branch 'origin/master'

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

@@ -216,31 +216,23 @@
 			SELECT
 				jr.id_ AS id,
 				jr.title_ AS title,
-				jr.is_discuss_personally AS isDiscussPersonally,
 				jr.requirements_ AS requirements,
 				jr.address_ AS address,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
 				sdda.name_ AS scaleName,
-			    sddb.name_ AS wageTypeN,
+				sddb.name_ AS wageTypeN,
 				bci.city_name AS cityName,
-				jwc.name_ AS code
+				sddc.name_ AS industry
 			FROM
 				job_recruitment AS jr
-			INNER JOIN base_company AS bc
-			INNER JOIN sys_data_dictionary AS sdda
-			INNER JOIN sys_data_dictionary AS sddb
-			INNER JOIN base_city AS bci
-			INNER JOIN job_work_category AS jwc ON jr.company_id = bc.id_
-			AND jr.area_ = bci.id_
-			AND jr.position_ = jwc.id_
-			AND bc.scale_ = sdda.id_
-			AND jr.wage_type = sddb.id_
+			INNER JOIN base_company AS bc ON jr.company_id = bc.id_
+			INNER JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
+			INNER JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
+			INNER JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
+			INNER JOIN base_city AS bci ON jr.area_ = bci.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and bc.id_ like #{searchParams.id}
-			</if>
 			<if test="searchParams.title != null">
 				and jr.title_ like #{searchParams.title}
 			</if>

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

@@ -438,8 +438,8 @@ public class RecruitmentApiController {
                 //添加收藏次数
                 Resume resume = resumeService.get(resumeId);
                 if(resume != null){
-                    int collectionTimes = resume.getCollectionTimes();
-                    if(collectionTimes < 0){
+                    Integer collectionTimes = resume.getCollectionTimes();
+                    if(collectionTimes==null||collectionTimes < 0){
                         collectionTimes = 0;
                     }
                     resume.setCollectionTimes(collectionTimes++);