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

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

@@ -262,7 +262,21 @@ public class GetPatentFromExcelThread extends Thread {
             patent.setApplicant(patentPeople);
 
         }
+        List<String> rightNames = uploadParamsVO.getPatentApplicantCurrentName();
 
+        //申请人
+        if (rightNames != null && rightNames.size() != 0) {
+            List<PatentPerson> patentPeople = new ArrayList<>();
+            for (int i = 0; i < rightNames.size(); i++) {
+                PatentPerson patentPerson = new PatentPerson();
+                patentPerson.setOrder(i + 1);
+                patentPerson.setType("1");
+                patentPerson.setName(rightNames.get(i));
+                patentPeople.add(patentPerson);
+            }
+            patent.setRightHolder(patentPeople);
+
+        }
         List<String> ipcList = uploadParamsVO.getIpcList();
         String mainIpc = uploadParamsVO.getMainIpc();
         //装载IPC分类号