Commit 8a745de2 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_isEmpty

parent 2a0d0db7
...@@ -1146,9 +1146,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1146,9 +1146,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isEmpty(tEmpEducation.getEmpCode())) { if (Common.isEmpty(tEmpEducation.getEmpCode())) {
tEmpEducation.setEmpCode(emp.getEmpCode()); tEmpEducation.setEmpCode(emp.getEmpCode());
} }
if (Common.isEmpty(tEmpEducation.getCreateBy())) {
tEmpEducation.setCreateBy(user.getId());
}
if (Common.isEmpty(tEmpEducation.getCreateTime())) { if (Common.isEmpty(tEmpEducation.getCreateTime())) {
tEmpEducation.setCreateTime(LocalDateTime.now()); tEmpEducation.setCreateTime(LocalDateTime.now());
} }
...@@ -1157,7 +1154,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1157,7 +1154,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(empIdCard)) { if (Common.isNotNull(empIdCard)) {
tEmpEducationService.updateEducationToNoByIdCard(empIdCard); tEmpEducationService.updateEducationToNoByIdCard(empIdCard);
} }
if (Common.isNotNull(tEmpEducation.getCreateBy())) { if (Common.isEmpty(tEmpEducation.getCreateBy())) {
tEmpEducation.setCreateBy(user.getId()); tEmpEducation.setCreateBy(user.getId());
tEmpEducation.setCreateName(user.getNickname()); tEmpEducation.setCreateName(user.getNickname());
tEmpEducation.setCreateTime(LocalDateTime.now()); tEmpEducation.setCreateTime(LocalDateTime.now());
...@@ -1176,7 +1173,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1176,7 +1173,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil.copyProperties(atta, newEmpAtta, ID); BeanUtil.copyProperties(atta, newEmpAtta, ID);
newEmpAtta.setDomainId(tEmpEducation.getId()); newEmpAtta.setDomainId(tEmpEducation.getId());
if (Common.isNotNull(tEmpEducation.getCreateBy())) { if (Common.isEmpty(tEmpEducation.getCreateBy())) {
tEmpEducation.setCreateBy(user.getId()); tEmpEducation.setCreateBy(user.getId());
tEmpEducation.setCreateName(user.getNickname()); tEmpEducation.setCreateName(user.getNickname());
tEmpEducation.setCreateTime(LocalDateTime.now()); tEmpEducation.setCreateTime(LocalDateTime.now());
...@@ -1199,7 +1196,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1199,7 +1196,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil.copyProperties(tPreEmpBadRecord, tEmpBadRecord, ID); BeanUtil.copyProperties(tPreEmpBadRecord, tEmpBadRecord, ID);
tEmpBadRecord.setEmpId(empId); tEmpBadRecord.setEmpId(empId);
if (Common.isNotNull(tEmpBadRecord.getCreateBy())) { if (Common.isEmpty(tEmpBadRecord.getCreateBy())) {
tEmpBadRecord.setCreateBy(user.getId()); tEmpBadRecord.setCreateBy(user.getId());
tEmpBadRecord.setCreateName(user.getNickname()); tEmpBadRecord.setCreateName(user.getNickname());
tEmpBadRecord.setCreateTime(LocalDateTime.now()); tEmpBadRecord.setCreateTime(LocalDateTime.now());
...@@ -1219,7 +1216,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1219,7 +1216,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil.copyProperties(tPreEmpContactInfo, tEmpContactInfo, ID); BeanUtil.copyProperties(tPreEmpContactInfo, tEmpContactInfo, ID);
tEmpContactInfo.setEmpId(empId); tEmpContactInfo.setEmpId(empId);
if (Common.isNotNull(tEmpContactInfo.getCreateBy())) { if (Common.isEmpty(tEmpContactInfo.getCreateBy())) {
tEmpContactInfo.setCreateBy(user.getId()); tEmpContactInfo.setCreateBy(user.getId());
tEmpContactInfo.setCreateName(user.getNickname()); tEmpContactInfo.setCreateName(user.getNickname());
tEmpContactInfo.setCreateTime(LocalDateTime.now()); tEmpContactInfo.setCreateTime(LocalDateTime.now());
...@@ -1246,7 +1243,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1246,7 +1243,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpDisabilityInfo.setEmpCode(emp.getEmpCode()); tEmpDisabilityInfo.setEmpCode(emp.getEmpCode());
} }
if (Common.isNotNull(tEmpDisabilityInfo.getCreateBy())) { if (Common.isEmpty(tEmpDisabilityInfo.getCreateBy())) {
tEmpDisabilityInfo.setCreateBy(user.getId()); tEmpDisabilityInfo.setCreateBy(user.getId());
tEmpDisabilityInfo.setCreateName(user.getNickname()); tEmpDisabilityInfo.setCreateName(user.getNickname());
tEmpDisabilityInfo.setCreateTime(LocalDateTime.now()); tEmpDisabilityInfo.setCreateTime(LocalDateTime.now());
...@@ -1272,7 +1269,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1272,7 +1269,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpFamily.setId(tPreEmpFamily.getOldId()); tEmpFamily.setId(tPreEmpFamily.getOldId());
} }
if (Common.isNotNull(tEmpFamily.getCreateBy())) { if (Common.isEmpty(tEmpFamily.getCreateBy())) {
tEmpFamily.setCreateBy(user.getId()); tEmpFamily.setCreateBy(user.getId());
tEmpFamily.setCreateName(user.getNickname()); tEmpFamily.setCreateName(user.getNickname());
tEmpFamily.setCreateTime(LocalDateTime.now()); tEmpFamily.setCreateTime(LocalDateTime.now());
...@@ -1299,7 +1296,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1299,7 +1296,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
info.setId(preInfo.getOldId()); info.setId(preInfo.getOldId());
} }
if (Common.isNotNull(info.getCreateBy())) { if (Common.isEmpty(info.getCreateBy())) {
info.setCreateBy(user.getId()); info.setCreateBy(user.getId());
info.setCreateName(user.getNickname()); info.setCreateName(user.getNickname());
info.setCreateTime(LocalDateTime.now()); info.setCreateTime(LocalDateTime.now());
...@@ -1316,7 +1313,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1316,7 +1313,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil.copyProperties(atta, newEmpAtta, ID); BeanUtil.copyProperties(atta, newEmpAtta, ID);
newEmpAtta.setDomainId(info.getId()); newEmpAtta.setDomainId(info.getId());
if (Common.isNotNull(atta.getCreateBy())) { if (Common.isEmpty(atta.getCreateBy())) {
atta.setCreateBy(user.getId()); atta.setCreateBy(user.getId());
atta.setCreateName(user.getNickname()); atta.setCreateName(user.getNickname());
atta.setCreateTime(LocalDateTime.now()); atta.setCreateTime(LocalDateTime.now());
...@@ -1342,7 +1339,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1342,7 +1339,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
info.setEmpName(emp.getEmpName()); info.setEmpName(emp.getEmpName());
info.setEmpIdcard(emp.getEmpIdcard()); info.setEmpIdcard(emp.getEmpIdcard());
if (Common.isNotNull(info.getCreateBy())) { if (Common.isEmpty(info.getCreateBy())) {
info.setCreateBy(user.getId()); info.setCreateBy(user.getId());
info.setCreateName(user.getNickname()); info.setCreateName(user.getNickname());
info.setCreateTime(LocalDateTime.now()); info.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