Commit 192560d5 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent ec620ce6
......@@ -1360,7 +1360,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setPreId(excel.getPreId());
}
dispatch.setCreateBy(null == user ? "1" : user.getId());
dispatch.setCreateName(null == excel.getPreName() ? user.getNickname() : excel.getPreName());
dispatch.setCreateName(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setCreateTime(LocalDateTime.now());
dispatch.setContractSubName(excel.getContractSubName());
dispatch.setContractName(excel.getContractName());
......@@ -1371,7 +1371,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setTryPeriod(excel.getTryPeriod());
dispatch.setEmpMobile(excel.getEmpMobile());
dispatch.setType(CommonConstants.ZERO_STRING);
dispatch.setCurrentOperator(null == excel.getPreName() ? user.getNickname() : excel.getPreName());
dispatch.setCurrentOperator(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setTrustRemark(excel.getTrustRemark());
dispatch.setBelongUnitName(excel.getCustomerName());
dispatch.setBelongUnit(excel.getCustomerId());
......
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