Commit 41b3f57e authored by huyuchen's avatar huyuchen

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

parents dd543258 fb35a5e6
......@@ -1587,6 +1587,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
auditLog.setMainId(main.getId());
auditLog.setAuditResult(status);
tPreEmpMainLogService.save(auditLog);
main.setStatus(status);
main.setAuditId(user.getId());
main.setAuditRemark("简档自动审核通过");
main.setAuditName(user.getNickname());
main.setAuditTime(new Date());
updateToEmployeeByPre(vo, isSimpleBoo);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment