添加申请页面抓取

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

@@ -60,9 +60,9 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
 
     @Override
     protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
-        if(!ObjectUtils.isEmpty(query.getAndConditionList())){
+        if(!ObjectUtils.isEmpty(query.getOrConditionList())){
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
-            appDatasetQuery.setAndConditionList(query.getAndConditionList());
+            appDatasetQuery.setAndConditionList(query.getOrConditionList());
             appDatasetQuery.setAppId(query.getAppId());
 
             PageInfo pageInfo = this.buildPageInfo(query);
@@ -71,7 +71,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
             if (!ObjectUtils.isEmpty(datasetIdList)) {
                 query.setIdList(datasetIdList);
             }
-            query.setAndConditionList(null);
+            query.setOrConditionList(null);
 
         }