Merge remote-tracking branch 'origin/master' into prod_test

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

@@ -421,7 +421,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         } else if (importTaskCondition.getType().equals(1)) {
             type = "【Excel】";
         }
-        if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(0)) {
+        if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(1)) {
             to = "专题库";
             LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(Project::getId, importTaskCondition.getProjectId());
@@ -429,7 +429,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             if (projects.size() != 0) {
                 toName = projects.get(0).getName();
             }
-        } else if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(1)) {
+        } else if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(2)) {
             to = "报告";
             LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(Project::getId, importTaskCondition.getProjectId());

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -1544,7 +1544,9 @@ public class PatentStarApiService {
                     String claimStr = claim.replaceAll("\t", "\n");
                     builder.append("                                   权利要求");
                     builder.append("\n");
-                    builder.append(claimStr);
+                    if (claim.length() > 50) {
+                        builder.append(claimStr);
+                    }
                 }
             }
         }
@@ -1558,11 +1560,13 @@ public class PatentStarApiService {
                 builder.append("\n");
                 builder.append("                                         说明书");
                 builder.append("\n");
-                builder.append(specification);
+                if (specification.length() > 50) {
+                    builder.append(specification);
+                }
             }
         }
         String result = builder.toString();
-        if (StringUtils.isNotEmpty(result)) {
+        if (StringUtils.isNotEmpty(result) && result.length() > 100) {
             byte[] bytes = result.getBytes();
             MultipartFile multipartFile = FileUtils.convertBytesToMultipartFile(bytes, patentNo + "-" + "文本文档.txt");
             List<String> list = fileManagerService.uploadFileGetGuid(Collections.singletonList(multipartFile));