取消事项缓存

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -126,14 +126,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     public List<SiteTreeSelect> siteTree(Context context) {
         Map<String, AreaEntity> areaMap = new HashMap<>();
         SiteQuery siteQuery = new SiteQuery();
-        Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet());
-
-        if (!ObjectUtils.isEmpty(siteSet)) {
-            List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList());
-            if (!ObjectUtils.isEmpty(siteIdList)) {
-                siteQuery.idList(siteIdList);
+        if (context.getUser().getSiteIds() != null) {
+            Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet());
+            if (!ObjectUtils.isEmpty(siteSet)) {
+                List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(siteIdList)) {
+                    siteQuery.idList(siteIdList);
+                }
             }
         }
+
+
         //查詢指定的站點ids
         log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
         List<SiteEntity> siteList = this.find(siteQuery);