添加站点事项过滤

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -28,7 +28,7 @@ public class SyncTreeSiteThread implements Runnable {
         SiteService siteService = SpringUtils.getBean(SiteService.class);
         List<SiteTreeSelect> siteTreeSelects = siteService.siteTree(context);
         siteService.setSiteTree(siteTreeSelects, context);
-        log.info("刷新用户站点树=》userID:{} siteTree:{}",context.getUser().getId(), JSON.toJSONString(siteService.getSiteTree(context)));
+        log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
     }
 
 }

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -201,7 +201,9 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
     @Override
     public Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException {
         SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
-        matterQuery.setAreaCode(siteCache==null?null:siteCache.getAreaCode());
+        if(ObjectUtils.isEmpty(matterQuery.getAreaCode())){
+            matterQuery.setAreaCode(siteCache==null?null:siteCache.getAreaCode());
+        }
         return this.dao.getSubList(matterQuery, pageInfo);
     }
 

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -30,7 +30,7 @@ POST {{baseUrl}}/matter/sublist
 Content-Type: application/json
 
 {
-  "siteId": 35,
+  "siteId": 5,
   "page": 1,
   "size": 10
 }

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

@@ -36,7 +36,7 @@ client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
 %}
 
 ###系统基础皮肤查看
-GET {{baseUrl}}/skin/base/view?id=28
+GET {{baseUrl}}/skin/base/view?id=37
 Authorization: {{authToken}}
 Accept: application/json