Bladeren bron

2/2 导入修改

lwhhszx 1 jaar geleden
bovenliggende
commit
3221d20100

+ 2 - 1
src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimService.java

@@ -110,7 +110,8 @@ public class PatentClaimService extends ServiceImpl<PatentClaimMapper, PatentCla
     public List<PatentClaimVO> ifHaveSplit(Integer projectId) {
         //根据报告id 查询是否有拆分权要
         LambdaQueryWrapper<PatentClaim> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PatentClaim::getProjectId, projectId).orderByAsc(PatentClaim::getSysOrder);
+        queryWrapper.eq(PatentClaim::getProjectId, projectId).
+               eq(PatentClaim::getContentType, 0).orderByAsc(PatentClaim::getSysOrder);
         List<PatentClaim> patentClaims = this.list(queryWrapper);
         List<PatentClaimVO> patentClaimVOS = new ArrayList<>();
         patentClaims.forEach(item -> {

+ 0 - 3
src/main/java/cn/cslg/pas/service/importPatent/ImportSinglePatentService.java

@@ -791,9 +791,6 @@ public class ImportSinglePatentService {
         LambdaQueryWrapper<PatentClaim> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(PatentClaim::getProjectId, projectId);
         List<PatentClaim> patentClaims = patentClaimService.list(queryWrapper1);
-        if (patentClaims == null || patentClaims.size() == 0) {
-            return;
-        }
         List<Integer> ids =patentClaims.stream().map(PatentClaim::getId).collect(Collectors.toList());
 
         List<Text> claims = patent.getClaim();