chendayu 2 rokov pred
rodič
commit
a456ae1367

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 203 - 59
PAS/src/main/java/cn/cslg/pas/common/utils/PatentRightUtils.java


+ 3 - 1
PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -697,7 +697,9 @@ public class UploadPatentBatchService {
         patent.setPublicNo(patentCell.getPublicNo());
         uploadParamsVO.setSimpleStatus(patentCell.getStatue());
         uploadParamsVO.setPatent(patent);
-        uploadParamsVO.getPatent().setAgencyId(patentAgencyService.getAgencyStringIdByName(patentCell.getAgency()));
+        if (patentCell.getAgency() != null && !patentCell.getAgency().equals("")) {
+            uploadParamsVO.getPatent().setAgencyId(patentAgencyService.getAgencyStringIdByName(patentCell.getAgency()));
+        }
         try {
             //专利信息 OS_PATENT
             if (uploadParamsVO.getPatent() != null) {