diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 7e369b1f..96fc3a60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -406,25 +406,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId()); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payIncomeContract.getSignedCompanyId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + PayWorkingGroupSubItem listPayWorkingGroupSubItem = payWorkingGroupSubItemService.getById(payIncomeContractAssociated.getProjectId()); + if(Objects.isNull(listPayWorkingGroupSubItem)){ throw new JeroBootException("工作组成员单位不存在!"); } // 更新项目id - payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.get(0).getId()); + payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.getId()); // todo 不是打包企业 取消打包 将关联项目取消打包 LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId()); + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId()); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); break; case PayIncomeContractCommon.PROJECT_TYPE3: