8/27 定时更新修改

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

@@ -333,7 +333,7 @@ public class WebVOTransformService {
                 patent.setMipc(patentClassify);
             }
         } else {
-            if (mainIpc != null || !mainIpc.equals("")) {
+            if (mainIpc != null && !mainIpc.equals("")) {
                 PatentClassify patentClassify = PatentClassifySplitter.split(mainIpc);
                 patent.setMipc(patentClassify);
                 patent.setIpc(Arrays.asList(patentClassify));
@@ -359,7 +359,7 @@ public class WebVOTransformService {
                 patent.setMipc(patentClassify);
             }
         } else {
-            if (mainIpc != null || !mainIpc.equals("")) {
+            if (mainIpc != null && !mainIpc.equals("")) {
                 PatentClassify patentClassify = PatentClassifySplitter.split(mainIpc);
                 patent.setMipc(patentClassify);
                 patent.setIpc(Arrays.asList(patentClassify));
@@ -395,7 +395,7 @@ public class WebVOTransformService {
                 patent.setMloc(patentClassify);
             }
         } else {
-            if (mainIpc != null || !mainIpc.equals("")) {
+            if (mainIpc != null && !mainIpc.equals("")) {
                 PatentClassify patentClassify = PatentClassifySplitter.split(mainIpc);
                 patent.setMloc(patentClassify);
                 patent.setLoc(Arrays.asList(patentClassify));
@@ -429,6 +429,9 @@ public class WebVOTransformService {
     }
 
     public void loadPatentCPC(Patent patent, List<String> cpcArr) {
+        if(cpcArr==null){
+            return;
+        }
         //装载IPC分类号
             List<PatentClassify> patentClassifies = new ArrayList<>();
             for (int i = 0; i < cpcArr.size(); i++) {
@@ -871,6 +874,9 @@ public class WebVOTransformService {
         patentImportErrorLog.insert();
     }
     public String getPersonType(String name, List<PatentPerson> personList) {
+        if(name==null){
+            return null;
+        }
         List<String> names = new ArrayList<>();
         if (personList != null) {
             names = personList.stream().map(PatentPerson::getName).collect(Collectors.toList());
@@ -1013,6 +1019,9 @@ public class WebVOTransformService {
 
 
     public  void getCnPatentPDF(String pdfUrlStr,StarPatentVO starPatentVO) throws Exception {
+       if(pdfUrlStr==null){
+           return;
+       }
         String  pdfUrl1 = "", pdfUrl2 = "";
         if (pdfUrlStr.contains("|http")) {  //若包含公开和授权两个pdf
             String[] pdfUrlArr = pdfUrlStr.split("\\|http");
@@ -1055,7 +1064,9 @@ public class WebVOTransformService {
     }
 
     public void getWdPatentPDF(String pdfUrl,String usedPatentNo) throws Exception{
-
+        if(pdfUrl==null){
+            return;
+        }
         if (!pdfUrl.equals("")) {
             String guid1 = FormatUtil.getPDFFormat(usedPatentNo, 0);
             File file1 = FileUtils.getFileByUrl(pdfUrl);