From f1b51379ec9db33f8035727a2f3961749a809d67 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Thu, 25 Apr 2024 17:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9D=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/common/CommonController.java    | 5 ++++-
 .../main/java/com/cyl/h5/controller/H5CommonController.java  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 4807ea0..d79108d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -136,7 +136,10 @@ public class CommonController
     public AjaxResult getAddressList() {
         String addresses = redisService.getAddressList();
         if (org.apache.commons.lang3.StringUtils.isNotEmpty(addresses)) {
-            return AjaxResult.success(JSON.parseArray(addresses, AddressDTO.class));
+            List<AddressDTO> addressDTOList = JSON.parseArray(addresses, AddressDTO.class);
+            if(addressDTOList.size()>0){
+                return AjaxResult.success(addressDTOList);
+            }
         }
         QueryWrapper<Address> addressQueryWrapper = new QueryWrapper<>();
         addressQueryWrapper.in("level", Arrays.asList(0,1,2));
diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java
index 127e78f..5263b54 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java
@@ -50,7 +50,10 @@ public class H5CommonController {
   public AjaxResult getAddressList() {
     String addresses = redisService.getAddressList();
     if (StringUtils.isNotEmpty(addresses)) {
-      return AjaxResult.success(JSON.parseArray(addresses, AddressDTO.class));
+      List<AddressDTO> addressDTOList = JSON.parseArray(addresses, AddressDTO.class);
+      if(addressDTOList.size()>0){
+        return AjaxResult.success(addressDTOList);
+      }
     }
     QueryWrapper<Address> addressQueryWrapper = new QueryWrapper<>();
     addressQueryWrapper.in("level", Arrays.asList(0,1,2));