From 6bfa73a4cbff36c536602faedfdd1951779c1789 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 10 Jul 2024 09:59:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=85=8D=E9=80=81=E6=9F=A5=E8=AF=A2=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=88=A4=E7=A9=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DistributionParcelListClient.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index b4d323274..f0d9e8ea2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -437,11 +438,19 @@ public class DistributionParcelListClient implements IDistributionParcelListClie @Override public List findListByOrderPackageCodeList(FindParamterDTO findParamterDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("order_package_code", findParamterDTO.getOrderPackageCodeList()) - .eq("warehouse_id", findParamterDTO.getWarehouseId()); + List orderPackageCodeList = findParamterDTO.getOrderPackageCodeList(); + if(CollUtil.isNotEmpty(orderPackageCodeList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("order_package_code", findParamterDTO.getOrderPackageCodeList()) + .eq("warehouse_id", findParamterDTO.getWarehouseId()); + return distributionParcelListService.list(queryWrapper); + }else{ + log.info("############findListByOrderPackageCodeList: 当前包件信息为空 orderPackageCodeList={}",orderPackageCodeList); + return null; + } + + - return distributionParcelListService.list(queryWrapper); } @Override