|
@@ -502,6 +502,8 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
|
|
|
|
|
|
//装载权要原文
|
|
|
PatentRightParams params = new PatentRightParams();
|
|
|
+ params.setPatentId(patentId);
|
|
|
+ params.setPatentNo(patent.getPatentNo());
|
|
|
//对获得的权利要求集合,判断集合元素个数若为1则为原文文本;若大于1则为已经拆分了的多个权要文本,此时就将其合并回原文文本
|
|
|
if (patentRights.size() == 1) {
|
|
|
params.setContent(patentRights.get(0).getContent());
|
|
@@ -520,20 +522,22 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
|
|
|
|
|
|
List<TreeNode> treeNodeList = new ArrayList<>();
|
|
|
|
|
|
- //判断若处理后的权要集合只有1个元素,则表示本次权要处理失败,则直接返回整个权要
|
|
|
- if (patentRightContents.size() == 1) {
|
|
|
- ArrayList<Integer> parentSorts = new ArrayList<>();
|
|
|
- parentSorts.add(-1);
|
|
|
- treeNodeList.add(new TreeNode(0, parentSorts, patentRightContents.get(0).getContent()).setChildren(new ArrayList<TreeNode>()));
|
|
|
+ //判断若处理后的权要集合只有1个元素并且类型type=-1、排序号sort=-1,则表示本次拆分失败,则直接返回整个权要
|
|
|
+ if (patentRightContents.size() == 1 && patentRightContents.get(0).getType() == -1 && patentRightContents.get(0).getSort() == -1) {
|
|
|
+ treeNodeList.add(new TreeNode(patentRightContents.get(0).getSort(), null, patentRightContents.get(0).getContent()));
|
|
|
return treeNodeList;
|
|
|
}
|
|
|
|
|
|
- //开始进行权要树装载
|
|
|
for (PatentRightContent patentRightContent : patentRightContents) {
|
|
|
treeNodeList.add(new TreeNode(patentRightContent.getSort(), patentRightContent.getParentSorts(), patentRightContent.getContent()));
|
|
|
}
|
|
|
- TreeBuild treeBuild = new TreeBuild(treeNodeList);
|
|
|
- treeNodeList = treeBuild.buildTree();
|
|
|
+ //开始进行权要树装载
|
|
|
+ try {
|
|
|
+ TreeBuild treeBuild = new TreeBuild(treeNodeList);
|
|
|
+ treeNodeList = treeBuild.buildTree();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
return treeNodeList;
|
|
|
|
|
|
}
|