5/27 修改查询问题

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.service.business.es;
 import cn.cslg.pas.common.core.base.IfConstant;
 import cn.cslg.pas.common.dto.*;
 import cn.cslg.pas.common.dto.business.ContentDetailDTO;
+import cn.cslg.pas.common.dto.es.EsCustomFieldValueDTO;
 import cn.cslg.pas.common.model.cronModel.Personnel;
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.Records;
@@ -86,6 +87,9 @@ public class EsPatentService {
     @Autowired
     private ProductService productService;
 
+    @Autowired
+    @Lazy
+    private EsService esService;
     /**
      * 根据专利号查询专利详情
      *
@@ -742,7 +746,15 @@ public class EsPatentService {
                 searchCondition = "projectId = " + projectId;
             }
         }
-
+        List<EsCustomFieldValueDTO> customFields = queryRequest.getCustomFields();
+        if (!CollectionUtils.isEmpty(customFields)) {
+            String customFieldCondition = esService.parseCustomField(customFields, projectId, taskId);
+            if (StringUtils.isNotEmpty(searchCondition)) {
+                searchCondition = searchCondition + " AND " + customFieldCondition;
+            } else {
+                searchCondition = customFieldCondition;
+            }
+        }
         //1. 解析检索条件
         treeNode tree = expressManager.getInstance().Parse(searchCondition, false);
         //格式化检索式