Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -1549,7 +1549,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 		preEmpMain.setAuditRemark(auditRemark);
 		preEmpMain.setAuditName(user.getNickname());
 		preEmpMain.setAuditTime(new Date());
-		this.updateById(preEmpMain);
+
 		// 审核日志
 		TPreEmpMainLog auditLog = new TPreEmpMainLog();
 		auditLog.setAuditId(user.getId());
@@ -1558,15 +1558,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 		auditLog.setAuditRemark(auditRemark);
 		auditLog.setMainId(preEmpMain.getId());
 		auditLog.setAuditResult(status);
-		tPreEmpMainLogService.save(auditLog);
+
 		R<PreEmpMainDetailVo> voR = this.getInfoById(id);
 		PreEmpMainDetailVo vo = null;
 		if (voR != null && voR.getCode() == CommonConstants.SUCCESS) {
 			// 转到更新档案去
 			vo = voR.getData();
+			this.updateById(preEmpMain);
+			tPreEmpMainLogService.save(auditLog);
 			return updateToEmployeeByPre(vo);
 		} else {
-			return R.ok("已审核未更新！");
+			return R.failed("未找到信息，未更新！");
 		}
 	}