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 addressDTOList = JSON.parseArray(addresses, AddressDTO.class); + if(addressDTOList.size()>0){ + return AjaxResult.success(addressDTOList); + } } QueryWrapper
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 addressDTOList = JSON.parseArray(addresses, AddressDTO.class); + if(addressDTOList.size()>0){ + return AjaxResult.success(addressDTOList); + } } QueryWrapper
addressQueryWrapper = new QueryWrapper<>(); addressQueryWrapper.in("level", Arrays.asList(0,1,2));