From c405ac152446d1b8b7c2272a72dccb929313a75c Mon Sep 17 00:00:00 2001 From: sdhkjh <2450473462@qq.com> Date: Thu, 26 Sep 2024 10:03:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E6=94=B6=E4=BB=B6=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/store/service/impl/ShopAddressServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java index 9b1fe2ce..42b427ea 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopAddressServiceImpl.java @@ -18,7 +18,6 @@ import com.skyeye.common.enumeration.WhetherEnum; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.entity.Member; import com.skyeye.eve.service.IAreaService; import com.skyeye.store.dao.ShopAddressDao; import com.skyeye.store.entity.ShopAddress; @@ -26,6 +25,7 @@ import com.skyeye.store.service.ShopAddressService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -95,7 +95,7 @@ public class ShopAddressServiceImpl extends SkyeyeBusinessServiceImpl list = list(queryWrapper); if (CollectionUtil.isEmpty(list)) { - return null; + return new ArrayList<>(); } iAreaService.setDataMation(list, ShopAddress::getProvinceId); iAreaService.setDataMation(list, ShopAddress::getCityId);