Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/CompareLiteratureService.java

@@ -386,8 +386,9 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
             return;
         }
         List<UpdateBatchLiteraturesDTO> dtos = updateBatchLiteratureDTO.getUpdateBatchLiteratureDTOs();
-        List<Integer> orders =dtos.stream().map(UpdateBatchLiteraturesDTO::getSysOrder).collect(Collectors.toList());
-                this.checkOrders(orders,projectId);
+        List<Integer> orders = dtos.stream().filter(i -> i.getId() == null).map(UpdateBatchLiteraturesDTO::getSysOrder).collect(Collectors.toList());
+        this.checkOrders(orders, projectId);
+
         int i = 1;
         for (UpdateBatchLiteraturesDTO item : dtos) {
             if (item.getType().equals(1)) {
@@ -510,7 +511,9 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
         //报告id
         compareLiterature.setProjectId(projectId);
         if (patentWithIdVO != null) {
-            literatureNo = patent.getPatentNo();
+            if(patent.getPatentNo() != null){
+                literatureNo = patent.getPatentNo();
+            }
         }
 
         //判断该专利是否已经作为文献

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

@@ -111,6 +111,7 @@ public class EsService {
      * @throws Exception
      */
     public PatentWithIdVO getIdByPatentNo(String patentNo) throws Exception {
+         String patentNo1 = patentNo.replace(" ", "");
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");
@@ -122,7 +123,7 @@ public class EsService {
 //        //授权号
 //        Query q3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(patentNo));
 //        Query query = QueryBuilders.bool(i -> i.should(q1, q2, q3));
-        Query query = QueryBuilders.term(t -> t.field("patent_no.keyword").value(patentNo));
+        Query query = QueryBuilders.term(t -> t.field("patent_no.keyword").value(patentNo1));
         builder.query(query);
         SearchResponse<Patent> response = null;
         try {

src/main/java/cn/cslg/pas/service/importPatent/ImportSinglePatentService.java

@@ -116,6 +116,7 @@ public class ImportSinglePatentService {
 
 
     public PatentWithIdVO addSinglePatent(String patentNo) {
+        patentNo = patentNo.replace(" ", "");
         PatentWithIdVO patentWithIdVO = new PatentWithIdVO();
 
         try {