Commit 5b8f2b88 authored by huyuchen's avatar huyuchen

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

parents a45a1e5a 7921f4f0
...@@ -2245,7 +2245,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2245,7 +2245,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contractAudit.setCreateName(vo.getCreateName()); contractAudit.setCreateName(vo.getCreateName());
contractAudit.setCreateTime(LocalDateTime.now()); contractAudit.setCreateTime(LocalDateTime.now());
//审核通过 //审核通过
c.setAuditUserName(c.getCreateBy()); c.setAuditUserName(vo.getCreateName());
if (CommonConstants.ZERO_STRING.equals(vo.getType())){ if (CommonConstants.ZERO_STRING.equals(vo.getType())){
c.setAuditStatus(CommonConstants.TWO_INT); c.setAuditStatus(CommonConstants.TWO_INT);
c.setInUse(CommonConstants.ZERO_STRING); c.setInUse(CommonConstants.ZERO_STRING);
......
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