From 8fbb55a271c244fcc0c9f860cf42e6df9bd35fd5 Mon Sep 17 00:00:00 2001 From: hhd <17835559578@163.com> Date: Mon, 10 Mar 2025 00:42:18 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=EF=BC=9A=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=82=B9=E5=88=9D=E6=AC=A1=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E7=BA=BF=E4=B8=8B=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E7=82=B9=E5=88=9D=E6=AC=A1=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=9B=A0=E4=B8=BA=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BAnull=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=80=E7=9B=B4=E5=A4=84=E4=BA=8E=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hhd <17835559578@163.com> --- .../admin/delivery/DeliveryPickUpStoreController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java index d4e5757439..95a8f5aa05 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java @@ -72,7 +72,7 @@ public class DeliveryPickUpStoreController { return success(null); } List verifyUsers = CollUtil.isNotEmpty(deliveryPickUpStore.getVerifyUserIds()) ? - adminUserApi.getUserList(deliveryPickUpStore.getVerifyUserIds()) : null; + adminUserApi.getUserList(deliveryPickUpStore.getVerifyUserIds()) : new ArrayList<>(); return success(BeanUtils.toBean(deliveryPickUpStore, DeliveryPickUpStoreRespVO.class) .setVerifyUsers(BeanUtils.toBean(verifyUsers, UserSimpleBaseVO.class))); } From a0e55afaeb33d8f747f25c70840646181fdd44f6 Mon Sep 17 00:00:00 2001 From: Hhd <17835559578@163.com> Date: Mon, 10 Mar 2025 20:05:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=EF=BC=9A=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=82=B9=E5=88=9D=E6=AC=A1=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E7=BA=BF=E4=B8=8B=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E7=82=B9=E5=88=9D=E6=AC=A1=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=9B=A0=E4=B8=BA=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BAnull=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=80=E7=9B=B4=E5=A4=84=E4=BA=8E=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/delivery/DeliveryPickUpStoreController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java index 95a8f5aa05..58e81ccf56 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; import java.util.Collection; import java.util.List;