huyc 项目档案代码提交

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

@@ -153,7 +153,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			//待划转员工已在目标结算主体下不可划转
 			TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
 					.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,excel.getNewSettleCode())
-					.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
+					.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL)
+					.eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT));
 			if (Common.isNotNull(tEmployeeProject)) {
 				errorMsg.add(MsgUtils.getMessage(ErrorCodes.CHECKS_CHANGE_EMP_PROJECT, excel.getNewSettleCode()));
 			}
@@ -164,7 +165,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 						.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,excel.getOldSettleCode())
 						.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
 				if (Common.isNotNull(updateTEmployeePro)) {
-					if (CommonConstants.ONE_STRING.equals(updateTEmployeePro.getProjectStatus())) {
+					if (CommonConstants.ONE_INT == updateTEmployeePro.getProjectStatus()) {
 						errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_DELETE_EXIT, excel.getOldSettleCode()));
 					} else if (Common.isNotNull(tSettleDomain)) {
 						updateTEmployeePro.setDeptNo(tSettleDomain.getDepartNo());