✨ 报告条件过滤

cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java

@@ -587,9 +587,9 @@ public class QueryCenterService {
         }
         JSONObject queryInfo = getQueryInfo(initQueryIndex(1));
         List<String> indexList = queryInfo.getBeanList("indexArr", String.class);
-        if(!indexList.contains(indexName)){
-            throw new RuntimeException("非法操作！");
-        }
+//        if(!indexList.contains(indexName)){
+//            throw new RuntimeException("非法操作！");
+//        }
         QueryBuilder queryBuilder = null;
         if (StrUtil.isNotEmpty(query.getCaseId())) {
             queryBuilder = QueryBuilders.termQuery("caseId", query.getCaseId());

cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java

@@ -128,11 +128,12 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe
         }
         lqw.like(StringUtils.isNotBlank(bo.getInformationSources()), CollectionInformation::getInformationSources, bo.getInformationSources());
         lqw.like(StringUtils.isNotBlank(bo.getName()), CollectionInformation::getName, bo.getName());
-        lqw.like(bo.getBasicInfo() != null, CollectionInformation::getBasicInfo, bo.getBasicInfo());
+        lqw.like(StringUtils.isNotBlank(bo.getBasicInfo()), CollectionInformation::getBasicInfo, bo.getBasicInfo());
         lqw.like(StringUtils.isNotBlank(bo.getRelationInfo()), CollectionInformation::getRelationInfo, bo.getRelationInfo());
         lqw.like(StringUtils.isNotBlank(bo.getAssetsInfo()), CollectionInformation::getAssetsInfo, bo.getAssetsInfo());
         lqw.like(StringUtils.isNotBlank(bo.getActionInfo()), CollectionInformation::getActionInfo, bo.getActionInfo());
         lqw.like(StringUtils.isNotBlank(bo.getRemark()), CollectionInformation::getRemark, bo.getRemark());
+
         lqw.in(CollectionUtil.isNotEmpty(bo.getIds()), CollectionInformation::getId, bo.getIds());
 
         if(StrUtil.isNotEmpty(bo.getAnalysisResultId())){
@@ -144,9 +145,18 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe
         if(StrUtil.isNotBlank(bo.getSearchValue())){
             String keyword = bo.getSearchValue().trim();
             String keywordQ = "*" + keyword.replaceAll("([　]|\\s|\\u00A0)+", "") + "*";
-            lqw.multiMatchQuery(keyword, CollectionInformation::getInformationSources, CollectionInformation::getName,
-                CollectionInformation::getBasicInfo,CollectionInformation::getRelationInfo,CollectionInformation::getAssetsInfo,
-                CollectionInformation::getActionInfo,CollectionInformation::getRemark);
+//            lqw.multiMatchQuery(keyword, CollectionInformation::getInformationSources, CollectionInformation::getName,
+//                CollectionInformation::getBasicInfo,CollectionInformation::getRelationInfo,CollectionInformation::getAssetsInfo,
+//                CollectionInformation::getActionInfo,CollectionInformation::getRemark);
+            lqw.or().like(CollectionInformation::getInformationSources, keyword);
+
+            lqw.or().like(CollectionInformation::getName, keyword);
+            lqw.or().like(CollectionInformation::getBasicInfo, keyword);
+            lqw.or().like(CollectionInformation::getRelationInfo, keyword);
+            lqw.or().like(CollectionInformation::getAssetsInfo, keyword);
+            lqw.or().like(CollectionInformation::getActionInfo, keyword);
+            lqw.or().like( CollectionInformation::getRemark, keyword);
+
 
         }
         return lqw;