Commit a47c9087 authored by huyuchen's avatar huyuchen

优化修改

parent 616d01d4
......@@ -694,13 +694,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(dispatchMap)){
dispatch = dispatchMap.get(excel.getEmpIdcard());
if (Common.isNotNull(dispatch)){
if(Common.isNotNull(empVo)) {
if (Common.isNotNull(empVo.getContactAddress()) && Common.isNotNull(excel.getContactAddress()) && !excel.getContactAddress().equals(empVo.getContactAddress())) {
dispatch.setContactAddress(empVo.getContactAddress());
}
}else {
dispatch.setContactAddress(excel.getContactAddress());
}
if (Common.isNotNull(social)){
dispatch.setSocialId(social.getId());
dispatch.setSocialHouseholdName(social.getSocialHouseholdName());
......@@ -1310,7 +1303,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(dispatch.getDispatchItem())){
return true;
}
dispatch.setContactAddress(excel.getContactAddress());
if(Common.isNotNull(empVo) && Common.isNotNull(empVo.getContactAddress())) {
dispatch.setContactAddress(empVo.getContactAddress());
} else {
dispatch.setContactAddress(excel.getContactAddress());
}
dispatch.setOrganName(user.getDeptName());
dispatch.setCreateBy(user.getId());
dispatch.setCreateTime(LocalDateTime.now());
......
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