12chenyi

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -76,7 +76,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
 
         }
 
-        return retList;
+        return patentRights;
     }
 
     /**

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -66,7 +66,8 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
     private final CompareFilesService compareFilesService;
     @Value("${fileURL}")
     private String fileURL;
-
+    @Value("${PASFile}")
+    private String url;
     public String reportDocument(ReportDocument reportDocument) {
 
         return Response.success();
@@ -743,7 +744,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         //专利权人
         patentMap.put("rightPerson", rightPerson);
         //图示
-        patentMap.put("abstractPath", "http://139.224.24.90:8081" + patent.get("abstractPath"));
+        patentMap.put("abstractPath", url + patent.get("abstractPath"));
         patentMap.put("name", patent.get("name"));
         //查询专利权要
         String resBody2 = outInterfaceService.getPatentRightFromPAS(patentNo);

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -122,6 +122,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         Integer id = loginUtils.getId();
         List<Integer> departIds = outInterfaceService.getDutyDepartsFromPCS(id);
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
+          queryWrapper.ne(Report::getId,0);
         if (reportVO.getName() != null) {
             queryWrapper.like(Report::getName, reportVO.getName());
         }

RMS/src/main/resources/application-prod2.0.yml

@@ -41,6 +41,7 @@ springdoc:
     enabled: false
 queueName: mail.queue
 fileURL:  http://139.224.24.90:8011
+PASFile: http://139.224.24.90:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
 PCS: http://139.224.24.90:81