优化修改

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -807,9 +807,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							tEmployeeProjectService.updateById(tEmployeeProject);
 							//如果项目档案已减项，如果人员存在多个项目不处理，反之则减档
 							TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-							if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT && Common.isNotNull(tEmployeeInfo)) {
-								TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
-								tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum() - CommonConstants.ONE_INT);
+							if (Common.isNotNull(tEmployeeInfo)) {
+								TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
 								// 判断人员有无审核通过的其他合同
 								TEmployeeContractInfo contractInfoInUse = this.getOne(Wrappers.<TEmployeeContractInfo>query()
 										.lambda().eq(TEmployeeContractInfo::getEmpId, contractInfo.getEmpId())
@@ -823,17 +822,20 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								} else {
 									tEmployeeInfo.setContractStatus(CommonConstants.TWO_INT);
 								}
-								//减项成功把人员档案现存项目数减一
-								if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
-									//减档
-									tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-									tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
-									tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
-									tEmployeeInfo.setLeaveUser(user.getId());
-									tEmployeeInfo.setLeaveUserName(user.getNickname());
-									workInfo.append("减档成功,");
-								} else {
-									failueInfo.append("存在其他项目，无法减档");
+								if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT) {
+									tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum() - CommonConstants.ONE_INT);
+									//减项成功把人员档案现存项目数减一
+									if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
+										//减档
+										tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
+										tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
+										tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
+										tEmployeeInfo.setLeaveUser(user.getId());
+										tEmployeeInfo.setLeaveUserName(user.getNickname());
+										workInfo.append("减档成功,");
+									} else {
+										failueInfo.append("存在其他项目，无法减档");
+									}
 								}
 								tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
 										"", tEmployeeInfoOld, tEmployeeInfo);
@@ -1760,9 +1762,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							tEmployeeProjectService.updateById(tEmployeeProject);
 							//如果项目档案已减项，如果人员存在多个项目不处理，反之则减档
 							tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-							if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT && Common.isNotNull(tEmployeeInfo)) {
+							if (Common.isNotNull(tEmployeeInfo)) {
 								TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
-								tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum() - CommonConstants.ONE_INT);
 								// 判断人员有无审核通过的其他合同
 								contractInfoInUse = this.getOne(Wrappers.<TEmployeeContractInfo>query()
 										.lambda().eq(TEmployeeContractInfo::getEmpId, contract.getEmpId())
@@ -1776,18 +1777,20 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								} else {
 									tEmployeeInfo.setContractStatus(CommonConstants.TWO_INT);
 								}
-								//减项成功把人员档案现存项目数减一
-								if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
-									//减档
-									tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-									tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
-									tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
-									tEmployeeInfo.setLeaveUser(user.getId());
-									tEmployeeInfo.setLeaveUserName(user.getNickname());
-									workInfo.append("减档成功,");
-									tEmployeeInfoMapper.updateById(tEmployeeInfo);
-								} else {
-									failueInfo.append("存在其他项目，无法减档");
+								if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT) {
+									tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum() - CommonConstants.ONE_INT);
+									//减项成功把人员档案现存项目数减一
+									if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
+										//减档
+										tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
+										tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
+										tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
+										tEmployeeInfo.setLeaveUser(user.getId());
+										tEmployeeInfo.setLeaveUserName(user.getNickname());
+										workInfo.append("减档成功,");
+									} else {
+										failueInfo.append("存在其他项目，无法减档");
+									}
 								}
 								tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
 										"", tEmployeeInfoOld, tEmployeeInfo);