From d112dcf0e07bcf86b00453f1a6d1f7fadb809760 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Tue, 16 Jul 2024 14:44:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=8E=88=E6=9D=83=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8B=B1=E6=96=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartPermissionController.java | 2 +- .../system/controller/SysRoleController.java | 2 +- .../com/jero/modules/system/model/TreeModel.java | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index c54293cd..3fa19f0e 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -229,7 +229,7 @@ public class SysDepartPermissionController extends JeroController treeList, List metaList, TreeModel temp) { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); - TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf()); + TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(), permission.getMenuEn(),permission.getRuleFlag(), permission.isLeaf()); if(temp==null && oConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if(!tree.getIsLeaf()) { diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index d83272db..6c4a0ad6 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -381,7 +381,7 @@ public class SysRoleController { private void getTreeModelList(List treeList,List metaList,TreeModel temp) { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); - TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf()); + TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(), permission.getMenuEn(),permission.getRuleFlag(), permission.isLeaf()); if(temp==null && oConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if(!tree.getIsLeaf()) { diff --git a/laws-module-system/src/main/java/com/jero/modules/system/model/TreeModel.java b/laws-module-system/src/main/java/com/jero/modules/system/model/TreeModel.java index ed9261eb..d80b20aa 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/model/TreeModel.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/model/TreeModel.java @@ -21,6 +21,8 @@ public class TreeModel implements Serializable { private String slotTitle; + private String slotTitleEn; + private boolean isLeaf; private String icon; @@ -97,11 +99,12 @@ public class TreeModel implements Serializable { } } - public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) { + public TreeModel(String key,String parentId,String slotTitle,String slotTitleEn,Integer ruleFlag,boolean isLeaf) { this.key = key; this.parentId = parentId; this.ruleFlag=ruleFlag; this.slotTitle = slotTitle; + this.slotTitleEn = slotTitleEn; Map map = new HashMap<>(); map.put("title", "hasDatarule"); this.scopedSlots = map; @@ -163,6 +166,14 @@ public class TreeModel implements Serializable { this.slotTitle = slotTitle; } + public String getSlotTitleEn() { + return slotTitleEn; + } + + public void setSlotTitleEn(String slotTitleEn) { + this.slotTitleEn = slotTitleEn; + } + public Integer getRuleFlag() { return ruleFlag; }