调整

common/src/main/java/com/jpsoft/employment/modules/job/entity/Recruitment.java

@@ -40,8 +40,6 @@ public class Recruitment {
 	@ApiModelProperty(value = "任职要求")
 	private String requirements;
 
-	@ApiModelProperty(value = "招聘工资")
-	private String wage;
 
 	@ApiModelProperty(value = "求职人数")
 	private Integer positionNumber;

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

@@ -12,7 +12,6 @@
 			<result property="position" column="position_" />
 			<result property="positionMessage" column="position_message" />
 			<result property="requirements" column="requirements_" />
-			<result property="wage" column="wage_" />
 			<result property="positionNumber" column="position_number" />
 			<result property="workYear" column="work_year" />
 			<result property="education" column="education_" />
@@ -41,7 +40,7 @@
 	-->
 	<![CDATA[
 		insert into job_recruitment
-	    (id_,company_id,title_,area_,address_,position_,position_message,requirements_,wage_,position_number,work_year,education_,position_sex,read_times,wage_type,is_discuss_personally,contact_person,tel_,status_,approve_status,reading_times,collection_times,delivery_times,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,company_id,title_,area_,address_,position_,position_message,requirements_,position_number,work_year,education_,position_sex,read_times,wage_type,is_discuss_personally,contact_person,tel_,status_,approve_status,reading_times,collection_times,delivery_times,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -52,7 +51,6 @@
 ,#{position,jdbcType=VARCHAR}
 ,#{positionMessage,jdbcType=VARCHAR}
 ,#{requirements,jdbcType=VARCHAR}
-,#{wage,jdbcType=VARCHAR}
 ,#{positionNumber,jdbcType= NUMERIC }
 ,#{workYear,jdbcType=VARCHAR}
 ,#{education,jdbcType=VARCHAR}
@@ -101,9 +99,6 @@
 		</if>
 				<if test="requirements!=null">
 		requirements_=#{requirements,jdbcType=VARCHAR},
-		</if>
-				<if test="wage!=null">
-		wage_=#{wage,jdbcType=VARCHAR},
 		</if>
 				<if test="positionNumber!=null">
 		position_number=#{positionNumber,jdbcType= NUMERIC },

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

@@ -396,7 +396,9 @@ public class ResumeDeliverController {
 
                 WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
 
-                dto.setPosition(workCategory.getName());
+                if(workCategory != null) {
+                    dto.setPosition(workCategory.getName());
+                }
 
             }