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

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

@@ -803,23 +803,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 									tEmployeeProject.getId(), tEmployeeProjectOld, tEmployeeProject);
 							tEmployeeProjectService.updateById(tEmployeeProject);
 							//如果项目档案已减项，如果人员存在多个项目不处理，反之则减档
-							if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT) {
-								TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-								if (Common.isNotNull(tEmployeeInfo) && tEmployeeInfo.getProjectNum() == CommonConstants.ONE_INT) {
+							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);
+								tEmployeeInfo.setContractStatus(CommonConstants.TWO_INT);
+								//减项成功把人员档案现存项目数减一
+								if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
 									//减档
-									TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
 									tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
 									tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
 									tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
 									tEmployeeInfo.setLeaveUser(user.getId());
 									tEmployeeInfo.setLeaveUserName(user.getNickname());
-									tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
-											"", tEmployeeInfoOld, tEmployeeInfo);
 									workInfo.append("减档成功,");
 									tEmployeeInfoMapper.updateById(tEmployeeInfo);
 								} else {
 									failueInfo.append("存在其他项目，无法减档");
 								}
+								tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
+										"", tEmployeeInfoOld, tEmployeeInfo);
 							}
 						}
 						//更新任务处理情况数据

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

@@ -1448,23 +1448,26 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						tEmployeeProject.getId(), tEmployeeProjectOld, tEmployeeProject);
 				baseMapper.updateById(tEmployeeProject);
 				//如果项目档案已减项，如果人员存在多个项目不处理，反之则减档
-				if (tEmployeeProject.getProjectStatus() == CommonConstants.ONE_INT) {
-					TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-					if (Common.isNotNull(tEmployeeInfo) && tEmployeeInfo.getProjectNum() == CommonConstants.ONE_INT) {
+				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);
+					tEmployeeInfo.setContractStatus(CommonConstants.TWO_INT);
+					//减项成功把人员档案现存项目数减一
+					if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
 						//减档
-						TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
 						tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
 						tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
 						tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
 						tEmployeeInfo.setLeaveUser(vo.getUserId());
 						tEmployeeInfo.setLeaveUserName(vo.getUserName());
-						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
-								"", tEmployeeInfoOld, tEmployeeInfo);
 						workInfo.append("减档成功,");
 						tEmployeeInfoMapper.updateById(tEmployeeInfo);
 					} else {
 						failueInfo.append("存在其他项目，无法减档");
 					}
+					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
+							"", tEmployeeInfoOld, tEmployeeInfo);
 				}
 			}
 			//更新任务处理情况查询表数据