修改bug

src/main/java/cn/cslg/pas/common/utils/FileUtils.java

@@ -110,7 +110,7 @@ public class FileUtils {
 
         URL url = new URL(dataUrl);  //想要读取的url地址
         InputStream in = url.openStream();
-        File file = File.createTempFile("new_url", ".jpg");  //创建文件
+        File file = File.createTempFile("new_url", ".pdf");  //创建文件
         OutputStream os = new FileOutputStream(file);  //创建文件输出流
         int bytesRead;
         byte[] buffer = new byte[8192];
@@ -123,7 +123,23 @@ public class FileUtils {
         in.close();
         return file;
     }
+    public static  File getPictureFileByUrl(String dataUrl) throws IOException {
 
+        URL url = new URL(dataUrl);  //想要读取的url地址
+        InputStream in = url.openStream();
+        File file = File.createTempFile("new_url", ".jpg");  //创建文件
+        OutputStream os = new FileOutputStream(file);  //创建文件输出流
+        int bytesRead;
+        byte[] buffer = new byte[8192];
+        int len = 8192;
+        while ((bytesRead = in.read(buffer, 0, len)) != -1) {
+            os.write(buffer, 0, bytesRead);
+        }
+        //关闭释放流
+        os.close();
+        in.close();
+        return file;
+    }
     public String getPath(String url) {
         return getStaticPath(COMMON_FILE) + url;
     }

src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/PersonNameQueryBuilder.java

@@ -26,7 +26,7 @@ public class PersonNameQueryBuilder implements IQueryBuilder {
     public Query creteQuery() throws ParseException {
         List<String> ids = new ArrayList<>();
         try {
-            String json = permissionService.getPersonIdByNamePCS(value, false);
+            String json = permissionService.getPersonIdByNamePCS(value, true);
             ids = JSON.parseArray(json, String.class);
         } catch (Exception e) {
         }
@@ -34,14 +34,16 @@ public class PersonNameQueryBuilder implements IQueryBuilder {
             ids = new ArrayList<>();
             ids.add("0");
         }
+        List<String> aa =new ArrayList<>();
         String strs = JsonData.of(ids).toString();
-        Query query = QueryBuilders.term(t -> t.field(field).value(strs));
+        Query query = QueryBuilders.terms(t -> t.field(field));
+
         return query;
     }
 
     @Override
     public String getField() {
-        return null;
+        return this.field;
     }
 
     @Override

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

@@ -187,7 +187,7 @@ public class EsScratchWordsService {
                 reQuery = QueryBuilders.bool(i -> i.must(riBool, q));
             }
         } catch (Exception e) {
-
+          System.out.println(e.getMessage());
         }
         return reQuery;
     }

src/main/java/cn/cslg/pas/service/business/invalidReport/AssoGroupFeatureService.java

@@ -398,7 +398,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
             queryFeatureHistoryDTO.setFeatureGroupId(item);
             List<AssoGroupFeature> assoGroupFeatures = this.getHistory(queryFeatureHistoryDTO);
             if (assoGroupFeatures.size() > 0) {
-                AssoGroupFeature assoGroupFeatures1 =assoGroupFeatures.stream().filter(i->notInAssoIds.contains(i)).findFirst().orElse(null);
+                AssoGroupFeature assoGroupFeatures1 =assoGroupFeatures.stream().filter(i->notInAssoIds.contains(i.getId())).findFirst().orElse(null);
                 if(assoGroupFeatures1==null) {
                     List<Integer> temIds = assoGroupFeatures.stream().map(AssoGroupFeature::getId).collect(Collectors.toList());
                     ids.addAll(temIds);

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

@@ -61,7 +61,7 @@ public class GetPatentPictureFromWebThread extends Thread {
                 PatentStarApiService patentStarApiService = applicationContext.getBean(PatentStarApiService.class);
                 String pictureUrl = patentStarApiService.getPictureApi(uploadPatentWebDTO.getStarPatentVO().getRowApplicationNo());
                 if (pictureUrl != null && pictureUrl != "{}") {
-                    File file = FileUtils.getFileByUrl(pictureUrl);
+                    File file = FileUtils.getPictureFileByUrl(pictureUrl);
                     FileManagerService fileManagerService = applicationContext.getBean(FileManagerService.class);
                     String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getApplicationNo());
                     fileManagerService.uploadFileWithGuid(file, guid);

src/main/resources/mapper/ReportProjectMapper.xml

@@ -17,7 +17,7 @@
         on rp.project_id =p.id left join asso_report_cron arc on p.id =arc.project_id
         left join asso_project_event as aspe on p.id =aspe.project_id
         <if test="sql1!=''">
-            where ${sql1}
+            where  (${sql1})
         </if>
         ${sql2} ${sql3}
     </select>