Merge branch '20230728_sun新增大屏接口功能' of sckj/mz-cloud into master

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WlfwDdjyServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.IWlfwDdjyService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -123,12 +124,15 @@ public class WlfwDdjyServiceImpl implements IWlfwDdjyService
     @Override
     public List<Map<String, Object>> selectLbt(WlfwDdjy wlfwDdjy) {
         test();
-        List<Map<String, Object>> res = new ArrayList<>();
+        List<Map<String, Object>> res;
         if (StringUtils.isNotEmpty(wlfwDdjy.getCreateAreaCode())) {
             res = redisService.getCacheObject(getCacheKey(wlfwDdjy.getCreateAreaCode()));
         } else {
             res = redisService.getCacheObject(getCacheKey(wlfwDdjy.getJgId()));
         }
+        if (ObjectUtils.isEmpty(res)) {
+            res = new ArrayList<>();
+        }
         return res;
     }