提交全图监控

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1996,7 +1996,6 @@ public class KwcContractTradeService {
                     contractTrades1.add(record);
                 }
             });
-            kwcContractTrades = contractTrades;
         }
         //如果登录方是供应方，创建方是采购方，那么供应方不能看到已作废的 合同
         if (entTypeResDto.getType().equals(EntTypeEnum.SUPPLIER.getCode())){
@@ -2009,8 +2008,9 @@ public class KwcContractTradeService {
                     contractTrades1.add(record);
                 }
             });
-            kwcContractTrades = contractTrades;
         }
+        contractTrades.addAll(contractTrades1);
+        kwcContractTrades = contractTrades;
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)){
             Map<Integer, List<KwcContractTrade>> statusAndLogOrdersMap = new HashMap<>();
             List<ContractStatusCountResp.ContractStatusCount> statusCounts = statusEnums.stream()