5/8

PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

@@ -440,8 +440,10 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
         //调用拆分权要工具类格式化并拆分权要理清父子级
         List<PatentRight> patentRights = patentRightUtils.formatPatentRight(params);
         //删除库表中原有该权要
-        this.deleteByPatentId(params.getPatentId());
-        this.saveOrUpdateBatch(patentRights);
+        if (patentRights != null && patentRights.size() > 0) {
+            this.deleteByPatentId(params.getPatentId());
+            this.saveOrUpdateBatch(patentRights);
+        }
 
 ////        获取国家 公开号前两位
 //        String country = PatentUtils.getPatentCountry(params.getPatentNo());

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -697,6 +697,7 @@ public class UploadPatentBatchService {
         patent.setPublicNo(patentCell.getPublicNo());
         uploadParamsVO.setSimpleStatus(patentCell.getStatue());
         uploadParamsVO.setPatent(patent);
+        getOneOrInsertOne(uploadParamsVO);
         if (patentCell.getAgency() != null && !patentCell.getAgency().equals("")) {
             uploadParamsVO.getPatent().setAgencyId(patentAgencyService.getAgencyStringIdByName(patentCell.getAgency()));
         }