diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java index 016227ba..3a22b186 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java @@ -48,6 +48,11 @@ public class SysRoleTreeModel implements Serializable { */ private String parentId; + /** + * 父类名称 + */ + private String parentName; + /** * 角色名称 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java index fa0c08bb..8285ca0c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java @@ -119,10 +119,14 @@ public class SysRoleServiceImpl extends ServiceImpl impl treeModel.setKey(sysRole.getId()); treeModel.setValue(sysRole.getId()); treeModel.setTitle(sysRole.getRoleName()); + treeModel.setParentName(sysRole.getRoleName()); List children = getChildrenByParentId(sysRole.getId()); treeModel.setChildren(children); treeModelList.add(treeModel); } + if (treeModelList.isEmpty()){ + return null; + } return treeModelList; }