Merge remote-tracking branch 'origin/master'

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

@@ -226,11 +226,11 @@
 				sddc.name_ AS industry
 			FROM
 				job_recruitment AS jr
-			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_
+			LEFT JOIN base_company AS bc ON jr.company_id = bc.id_
+			LEFT JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
+			LEFT JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
+			LEFT JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
+			LEFT JOIN base_city AS bci ON jr.area_ = bci.id_
 		]]>
 		<where>
 			<if test="searchParams.title != null">

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -94,16 +94,8 @@ public class RecruitmentController {
             recruitment.setReadingTimes(0);
             recruitment.setCollectionTimes(0);
             recruitment.setDeliveryTimes(0);
-            String zone = "";
             if(company!=null){
-                if(StringUtils.isNotEmpty(company.getArea())){
-                    JSONObject jsonObject = JSONObject.fromObject(company.getArea());
-                    if(jsonObject!=null&&jsonObject.size()>0){
-                        zone = jsonObject.get("zone").toString();
-                    }
-                }
-
-                recruitment.setArea(zone);
+                recruitment.setArea(company.getArea());
             }
 
             //是否面议