3/6

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

@@ -134,7 +134,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
             List<TortRightVO> tortRightVOS = this.loadTortRightVO(patentNo, taskId, patentRightVos);
             tortCompareRecordVO.setTortRightVOS(tortRightVOS);
         } else {
-            throw new XiaoShiException("特征查询错误");
+            tortCompareRecordVO = new TortCompareRecordVO();
         }
         return tortCompareRecordVO;
     }

src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimHistoryService.java

@@ -124,7 +124,9 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         patentClaimHistoryVO.setOriginalClaimVO(originalClaimVO);
         //装载权要历史
         Map<Integer, QueryPatentClaimHistoryVO> historyVOMap = this.loadHistoryVO(claimId);
+        //第一次修改
         QueryPatentClaimHistoryVO firstClaimVO = historyVOMap.get(1);
+        //第二次修改
         QueryPatentClaimHistoryVO secondClaimVO = historyVOMap.get(2);
         patentClaimHistoryVO.setFirstClaimVO(firstClaimVO);
         patentClaimHistoryVO.setSecondClaimVO(secondClaimVO);
@@ -153,11 +155,12 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         Map<Integer, QueryPatentClaimHistoryVO> historyVOMap = new HashMap<>();
 
         LambdaQueryWrapper<PatentClaimHistory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PatentClaimHistory::getClaimId, claimId);
+        queryWrapper.eq(PatentClaimHistory::getClaimId, claimId)
+                .orderByDesc(PatentClaimHistory::getCreateTime);
         List<PatentClaimHistory> patentClaimHistoryList = this.list(queryWrapper);
         if (!patentClaimHistoryList.isEmpty()) {
-            PatentClaimHistory patentClaimHistory1 = patentClaimHistoryList.stream().filter(item -> item.getIfFirst().equals(true)).findFirst().orElse(null);
-            PatentClaimHistory patentClaimHistory2 = patentClaimHistoryList.stream().filter(item -> item.getIfFirst().equals(false)).findFirst().orElse(null);
+            PatentClaimHistory patentClaimHistory1 = patentClaimHistoryList.stream().filter(item -> !item.getOperateType().equals(2) && item.getIfFirst().equals(true)).findFirst().orElse(null);
+            PatentClaimHistory patentClaimHistory2 = patentClaimHistoryList.stream().filter(item -> !item.getOperateType().equals(2) && item.getIfFirst().equals(false)).findFirst().orElse(null);
             if (patentClaimHistory1 != null) {
                 QueryPatentClaimHistoryVO firstClaimVO = new QueryPatentClaimHistoryVO();
                 firstClaimVO.setClaimHistoryId(patentClaimHistory1.getId());