Commit 69b535aa authored by fangxinjiang's avatar fangxinjiang

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

parents 4bcc820c bc2d7eca
...@@ -403,19 +403,22 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -403,19 +403,22 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
sb.append("/合同"); sb.append("/合同");
} }
} }
} catch (Exception e) {
log.error("调用社保商险服务更新数据异常", e); if (sb.length() > 0) {
}
//增加操作日期 //增加操作日期
preLog = new TEmployeePreLog(); preLog = new TEmployeePreLog();
preLog.setCreateTime(LocalDateTime.now()); preLog.setCreateTime(LocalDateTime.now());
preLog.setCreateName(userName); preLog.setCreateName(userName);
preLog.setUpdateTime(LocalDateTime.now()); preLog.setUpdateTime(LocalDateTime.now());
preLog.setPreId(updatePre.getId()); preLog.setPreId(updatePre.getId());
preLog.setDiffTitle("人员离职确认联动删除的待办:"+sb); preLog.setDiffTitle("人员离职确认联动删除的待办:" + sb);
preLog.setMenuInfo("入职建档"); preLog.setMenuInfo("入职建档");
tEmployeePreLogService.save(preLog); tEmployeePreLogService.save(preLog);
} }
} catch (Exception e) {
//log.error("调用社保商险服务更新数据异常", e)
}
}
} }
return true; return true;
} }
......
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