diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 18c4e4b8..a380a17c 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -179,11 +179,11 @@ public class SysDictItem implements TreeNode { private List childrenList; /** - * 是否还有子集 + * 是否是叶子节点 */ @TableField(exist = false) - @ApiModelProperty(value = "是否还有子集") - private boolean hasChild; + @ApiModelProperty(value = "是否是叶子节点") + private boolean isLeaf; @Override public String obtainTreeNodeId() { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/PartName.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/PartName.java index 87528107..c6c1001f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/PartName.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/PartName.java @@ -99,11 +99,11 @@ public class PartName implements Serializable, TreeNode { private String parentCode; /** - * 父级分类内部码(根节点0) + * 是否是叶子节点 */ - @ApiModelProperty(value = "父级分类内部码(根节点0)") + @ApiModelProperty(value = "是否是叶子节点") @TableField(exist = false) - private boolean hasChild; + private boolean isLeaf; /** * 子零部件 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java index c8cb084b..1b0c800e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java @@ -40,7 +40,7 @@ public class DictTreeService { List childList = dictItemService.list(queryWrapper); list.forEach(item -> { if (childList.stream().anyMatch(child -> child.getParentId().equals(item.getId()))) { - item.setHasChild(true); + item.setLeaf(false); } }); return list; @@ -73,7 +73,7 @@ public class DictTreeService { List childList = dictItemService.list(queryWrapper); list.forEach(item -> { if (childList.stream().anyMatch(child -> child.getParentId().equals(item.getId()))) { - item.setHasChild(true); + item.setLeaf(false); } }); return list; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java index af4ea297..2a6a39cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java @@ -196,7 +196,7 @@ public class PartNameServiceImpl extends ServiceImpl List childList = list(queryWrapper); list.forEach(item -> { if (childList.stream().anyMatch(child -> child.getParentCode().equals(item.getCode()))) { - item.setHasChild(true); + item.setLeaf(false); } }); return list; @@ -221,7 +221,7 @@ public class PartNameServiceImpl extends ServiceImpl List childList = list(queryWrapper); list.forEach(item -> { if (childList.stream().anyMatch(child -> child.getParentCode().equals(item.getCode()))) { - item.setHasChild(true); + item.setLeaf(false); } }); return list;