划转

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

@@ -408,9 +408,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL).eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT));
 		if (Common.isNotNull(updateTEmployeeProject)) {
 
-			if (updateTEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1] ||
-					updateTEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]) {
-				return R.failed("人员在原项目中存在在途的服务(社保或公积金在途)，请先终止后，再进行划转");
+			if (updateTEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]
+					&& vo.getChangeItems().indexOf(CommonConstants.ONE_STRING) >= CommonConstants.ZERO_INT) {
+				return R.failed("人员在原项目中存在在途的社保，请先终止后，再进行划转");
+			}
+			if (updateTEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]
+					&& vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT){
+				return R.failed("人员在原项目中存在在途的公积金，请先终止后，再进行划转");
 			}
 
 			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()