Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/feign/VehicleTraceClient.java

@@ -4,6 +4,7 @@ import com.sckw.core.web.response.BaseResult;
 import com.sckw.transport.api.model.dto.VehicleDataDTO;
 import com.sckw.transport.api.model.dto.VehicleReturnData;
 import com.sckw.transport.api.model.vo.VehicleTraceResponse;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +23,7 @@ import java.util.List;
     path = "/api/transfer",
     configuration = VehicleTraceFeignConfig.class
 )
+@ConditionalOnProperty(name = "vehicle.trace.api.base-url")
 public interface VehicleTraceClient {
 
     /**

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()