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

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

@@ -209,7 +209,13 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     public List<SiteTreeSelect> siteTree(Context context) {
         Map<String, AreaEntity> areaMap = new HashMap<>();
         SiteQuery siteQuery = new SiteQuery();
-        if (context.getUser().getSiteIds() != null) {
+
+        //如果站点为空 或者用户为空 返回空数组
+        if (context.getUser() == null || context.getUser().getSiteIds() == null) {
+            return new ArrayList<>();
+        }
+
+        if (context.getUser() != null && 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());
@@ -459,7 +465,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             throw new AppException("当前站点无子区域！");
         }
         siteAreaVo.setAreaCode(areaEntity.getAreaCode());
-        siteAreaVo.setAreaName(AreaLevelEnum.getByValue(areaEntity.getAreaLevel()).getValue()==AreaLevelEnum.地市州.getValue()?"市本级":areaEntity.getName());
+        siteAreaVo.setAreaName(AreaLevelEnum.getByValue(areaEntity.getAreaLevel()).getValue() == AreaLevelEnum.地市州.getValue() ? "市本级" : areaEntity.getName());
         List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
         siteAreaVo.setSiteList(siteEntityList);
         list.add(siteAreaVo);
@@ -676,7 +682,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         //HashSet<String> matterNoSet = new HashSet<>();
 
 
-        Set<String> matterNoSet = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode())).parallelStream().map(i->i.getMatterNo()).collect(Collectors.toSet());
+        Set<String> matterNoSet = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode())).parallelStream().map(i -> i.getMatterNo()).collect(Collectors.toSet());
 
        /* Integer page = 1;
         Integer size = 200;