caozj пре 2 година
родитељ
комит
a1444b1c56

+ 4 - 4
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -897,7 +897,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         List<PurchaseDetail> purchaseDetailList = purchaseDetailService.list(q -> q.in(PurchaseDetail::getPurchaseId, purchaseIdList));
 
         // 赋值关联销售合同
-        setContractInfo(vo, purchaseDetailList);
+        setContractInfo(vo, purchaseList);
 
         // 赋值采购合同数据
         setPurchaseInfo(vo, purchaseList, purchaseDetailList);
@@ -1024,11 +1024,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     /**
      * 赋值销售合同数据
      */
-    private void setContractInfo(PayDecisionAidVo vo, List<PurchaseDetail> purchaseDetailList) {
+    private void setContractInfo(PayDecisionAidVo vo, List<Purchase> purchaseList) {
 
-        List<Long> contractIdList = purchaseDetailList.stream()
+        List<Long> contractIdList = purchaseList.stream()
                 .filter(item -> Objects.equals(item.getDataResource(), 1))
-                .map(PurchaseDetail::getDataResourceId)
+                .map(Purchase::getDataResourceId)
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());