代码结构调整

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -1601,10 +1601,14 @@ public class StoreApiServiceImpl implements StoreApiService {
                 }
                 return false;
             }).map(TabStoreTag::getStoreWidgetId).collect(Collectors.toList());
-            if(CollectionUtils.isEmpty(storeSearchDTO.getStoreResourceList())){
-                storeSearchDTO.setStoreResourceList(new ArrayList<>());
+            if(CollectionUtils.isNotEmpty(storeWidgetList)){
+                List<JSONObject> jsonObjectOrList = new ArrayList<>();
+                for (Integer storeResource : storeWidgetList) {
+                    String s = this.buildStoreWidgetJson(storeResource, json, jsonObjectOrList);
+                }
+                JSONObject object = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectOrList, OperateEnum.OPERATE_OR);
+                jsonObjectList.add(object);
             }
-            storeSearchDTO.getStoreResourceList().addAll(storeWidgetList);
         }
         String storeWidgetJson = this.buildStoreWidgetJson(storeSearchDTO.getStoreResource() == null ? null : storeSearchDTO.getStoreResource().intValue(), json, jsonObjectList);
         /*****如果存在没有门店权限的门店控件id，直接返回*****/
@@ -1762,7 +1766,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         return json;
     }
 
-    private String buildStoreWidgetJson(Integer storeWidgetId, JSONObject json, List<JSONObject> jsonObjectList){
+    private String  buildStoreWidgetJson(Integer storeWidgetId, JSONObject json, List<JSONObject> jsonObjectList){
         if(storeWidgetId != null){
             StoreWidgetDTO storeWidget = this.storeWidgetService.getStoreWidget(storeWidgetId.intValue());
             if(storeWidget != null){