diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index f7cbe544..279029cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -145,10 +145,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId); - queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE2); List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ List listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); @@ -194,7 +194,7 @@ public class PayWorkingGroupSubItemController extends JeroController listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId); - queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1); + queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2); List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ List listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 6b54cc6d..b5221ddf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -145,10 +145,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl