Merge remote-tracking branch 'origin/master'

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

@@ -226,19 +226,23 @@
 				jr.requirements_ AS requirements,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
-				sdda.name_ AS scaleName,
+			    bci.city_name AS cityName,
+			    sdda.name_ AS education,
 				sddb.name_ AS wageTypeN,
-				bci.city_name AS cityName,
-				sddc.name_ AS industry,
-				sddd.name_ AS workYear
+				sddc.name_ AS workYear,
+			    sddd.name_ AS scaleName,
+			    sdde.name_ AS industry,
+			    jwc.name_ AS positionName
 			FROM
 				job_recruitment AS jr
 			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 sdda ON jr.education_ = 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 sys_data_dictionary AS sddd ON jr.work_year = sddd.id_
+			LEFT JOIN sys_data_dictionary AS sddc ON jr.work_year = sddc.id_
+			LEFT JOIN sys_data_dictionary AS sddd ON bc.scale_ = sddd.id_
+			LEFT JOIN sys_data_dictionary AS sdde ON bc.industry_ = sdde.id_
 			LEFT JOIN base_city AS bci ON jr.area_ = bci.id_
+			LEFT JOIN job_work_category jwc ON jr.position_ = jwc.id_
 		]]>
 		<where>
 			<if test="searchParams.title != null">

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -240,8 +240,8 @@ public class CompanyController {
 
         Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(Company company : page.getResult()){
-            company.setScaleName(dataDictionaryService.findNameByCatalogNameAndValue("企业规模", company.getScale()));
-            company.setIndustryName(dataDictionaryService.findNameByCatalogNameAndValue("所属行业", company.getIndustry()));
+            company.setScaleName(dataDictionaryService.getName(company.getScale()));
+            company.setIndustryName(dataDictionaryService.getName(company.getIndustry()));
         }
 
         msgResult.setResult(true);

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

@@ -208,7 +208,7 @@ public class RecruitmentApiController {
             String wageTypeN = dataDictionaryService.getName(recruitment.getWageType());
             recruitment.setWageTypeName(wageTypeN);
             //性别要求
-            String sexN = dataDictionaryService.getName(recruitment.getPositionSex());
+            String sexN = dataDictionaryService.findNameByCatalogNameAndValue("性别",recruitment.getPositionSex());
             recruitment.setPositionSexN(sexN);
             //工作年限
             String workYearN = dataDictionaryService.getName(recruitment.getWorkYear());