添加根据部门id 查询所属大厅

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

@@ -211,11 +211,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         SiteQuery siteQuery = new SiteQuery();
 
         //如果站点为空 或者用户为空 返回空数组
-        if (context.getUser() == null || context.getUser().getSiteIds() == null) {
+        if (context.getUser() == null) {
             return new ArrayList<>();
         }
+        List<SiteEntity> siteList = new ArrayList<>();
 
-        if (context.getUser() != null && context.getUser().getSiteIds() != null) {
+        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());
@@ -223,17 +224,20 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                     siteQuery.idList(siteIdList);
                 }
             }
+            //查詢指定的站點ids
+            log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
+            siteList = this.find(siteQuery);
         }
-
-        //查詢指定的站點ids
-        log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
-        List<SiteEntity> siteList = this.find(siteQuery);
         //如果是管理员 默认全部站点
-        if (context.getUser().isAdmin()) {
+        if (context.getUser().isAdmin() || context.getUser().getId() == 0L) {
             log.info("user is admin !");
             siteList = this.find(new SiteQuery());
         }
 
+        if (ObjectUtils.isEmpty(siteList)) {
+            return new ArrayList<>();
+        }
+
         //turn to sitemap
         Map<String, SiteEntity> siteMap = siteList.parallelStream().collect(Collectors.toMap(x -> x.getSiteCode(), y -> y, (o, n) -> n));
         //遍历过滤站点树