添加微官网列表接口

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

@@ -214,17 +214,20 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     @Override
     public Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException {
-        SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
-        Result<MatterEntity> matterEntityResult = this.find(matterQuery, pageInfo, context);
-        List<MatterInfo> matterInfoList = matterEntityResult.getList().stream().map(item -> {
-            MatterInfo matterInfo = new MatterInfo();
-            BeanUtils.copyProperties(item, matterInfo, BeanUtil.getNullPropertyNames(item));
-            matterInfo.setSiteName(siteCache == null ? "" : siteCache.getSiteName());
-            return matterInfo;
-        }).collect(Collectors.toList());
         Result<MatterInfo> matterInfoResult = new Result<>();
-        matterInfoResult.setList(matterInfoList);
-        matterInfoResult.setPageInfo(pageInfo);
+        if (!ObjectUtils.isEmpty(matterQuery.getSiteId())) {
+            SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
+            matterQuery.setSiteId(null);
+            Result<MatterEntity> matterEntityResult = this.find(matterQuery, pageInfo, context);
+            List<MatterInfo> matterInfoList = matterEntityResult.getList().stream().map(item -> {
+                MatterInfo matterInfo = new MatterInfo();
+                BeanUtils.copyProperties(item, matterInfo, BeanUtil.getNullPropertyNames(item));
+                matterInfo.setSiteName(siteCache == null ? "" : siteCache.getSiteName());
+                return matterInfo;
+            }).collect(Collectors.toList());
+            matterInfoResult.setList(matterInfoList);
+            matterInfoResult.setPageInfo(pageInfo);
+        }
         return matterInfoResult;
     }
 

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

@@ -25,6 +25,16 @@ Content-Type: application/json
   "size": 10
 }
 
+###微官网事项列表
+POST {{baseUrl}}/micro/matter/list
+Content-Type: application/json
+
+{
+  "idList": [1,2],
+  "page": 1,
+  "size": 10
+}
+
 ###基础事项差集列表
 POST {{baseUrl}}/matter/sublist
 Content-Type: application/json