huyc 项目档案代码提交

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

@@ -244,16 +244,19 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		if (Common.isNotNull(jsonObject)) {
 			String empId = jsonObject.getString("empId");
 			String empProId = jsonObject.getString("empProId");
-			TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(empId);
-			TEmployeeProject tEmployeeProjectOld = this.getById(empProId);
+
+			TEmployeeInfo tEmployeeInfoOld;
+			TEmployeeProject tEmployeeProjectOld;
 			if (!Common.isEmpty(empId) && Common.isEmpty(empProId)) {
 				//复档
+				tEmployeeInfoOld = tEmployeeInfoMapper.selectById(empId);
 				TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(empId);
 				tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[0]);
 				tEmployeeInfoMapper.updateById(tEmployeeInfo);
 				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], empId, "", tEmployeeInfoOld, tEmployeeInfo);
 			} else if (Common.isEmpty(empId) && !Common.isEmpty(empProId)) {
 				//复项
+				tEmployeeProjectOld = this.getById(empProId);
 				TEmployeeProject tEmployeeProject = this.getById(empProId);
 				tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[0]);
 				this.updateById(tEmployeeProject);
@@ -264,6 +267,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						.eq(TEmployeeInfo::getFileStatus, CommonConstants.ZERO_INT));
 
 				if (Common.isNotNull(tEmployeeInfo)) {
+					tEmployeeInfoOld = tEmployeeInfoMapper.selectById(empId);
 					//查询该人员所有的的项目档案
 					List<TEmployeeProject> list = this.list(Wrappers.<TEmployeeProject>query().lambda()
 							.eq(TEmployeeProject::getEmpIdcard, tEmployeeProject.getEmpIdcard())
@@ -288,6 +292,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				}
 				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", empProId, tEmployeeProjectOld, tEmployeeProject);
 			} else {
+				tEmployeeInfoOld = tEmployeeInfoMapper.selectById(empId);
+				tEmployeeProjectOld = this.getById(empProId);
 				//复档复项
 				TEmployeeProject tEmployeeProject = this.getById(empProId);
 				tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[0]);