Merge remote-tracking branch 'origin/master'

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

@@ -156,7 +156,7 @@ public class ResumeApiController {
                     return messageResult;
                 }
 
-                if(!"2".equals(resume.getApproveStatus())){
+                if(!"3".equals(resume.getApproveStatus())){
                     messageResult.setMessage("当前简历未审批");
                     messageResult.setResult(false);
                     messageResult.setCode(400);
@@ -171,7 +171,7 @@ public class ResumeApiController {
             rd.setDelFlag(false);
             rd.setJobRecruitmentId(recruitmentId);
             rd.setJobUserId(subject);
-            rd.setJobResumeId(resumeId);
+            rd.setJobResumeId(resume.getId());
             rd.setStatus("0");
             rd.setChatStatus("1");