Merge remote-tracking branch 'origin/master'

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

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