Merge remote-tracking branch 'origin/master'

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

@@ -501,7 +501,7 @@ public class JobUserApiController {
 
             jobUser.setIdCard(idCard);
             if(StringUtils.isNotEmpty(positiveUrl) && StringUtils.isNotEmpty(reverseUrl) ) {
-                jobUser.setHeadImageUrl(positiveUrl + "," + reverseUrl);
+                jobUser.setIdCardUrl(positiveUrl + "," + reverseUrl);
             }
             jobUser.setRealName(name);
             jobUser.setIsAuthentication("2");//待审核
@@ -517,12 +517,13 @@ public class JobUserApiController {
                 uaa.setCreateBy(subject);
                 uaa.setDelFlag(false);
                 uaa.setJobUserId(jobUser.getId());
-
+                uaa.setApprovalStatus("2");
                 userAuthenticationApproveService.insert(uaa);
             }else{
                 uaa.setUpdateTime(new Date());
                 uaa.setUpdateBy(subject);
                 uaa.setJobUserId(jobUser.getId());
+                uaa.setApprovalStatus("2");
                 userAuthenticationApproveService.update(uaa);
             }