From 14e34c247d8ae0657f825a8dc77ef5bf2be38da0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 17:40:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/system/vo/SysRoleTreeModel.java | 5 +++++ .../jero/modules/system/service/impl/SysRoleServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) 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; }