QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:角色管理、授权树形结构增加英文字段

Browse Source
This commit is contained in:
fengchenchen
2024-07-16 14:44:42 +08:00
parent 73e8c6ce86
commit d112dcf0e0
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
+1 -1
View File
@@ -229,7 +229,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) { private void getTreeModelList(List<TreeModel> treeList, List<SysPermission> metaList, TreeModel temp) {
for (SysPermission permission : metaList) { for (SysPermission permission : metaList) {
String tempPid = permission.getParentId(); 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)) { if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree); treeList.add(tree);
if(!tree.getIsLeaf()) { if(!tree.getIsLeaf()) {
laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+1 -1
View File
@@ -381,7 +381,7 @@ public class SysRoleController {
private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) { private void getTreeModelList(List<TreeModel> treeList,List<SysPermission> metaList,TreeModel temp) {
for (SysPermission permission : metaList) { for (SysPermission permission : metaList) {
String tempPid = permission.getParentId(); 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)) { if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree); treeList.add(tree);
if(!tree.getIsLeaf()) { if(!tree.getIsLeaf()) {
laws-module-system/src/main/java/com/jero/modules/system/model/TreeModel.java
+12 -1
View File
@@ -21,6 +21,8 @@ public class TreeModel implements Serializable {
private String slotTitle; private String slotTitle;
private String slotTitleEn;
private boolean isLeaf; private boolean isLeaf;
private String icon; 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.key = key;
this.parentId = parentId; this.parentId = parentId;
this.ruleFlag=ruleFlag; this.ruleFlag=ruleFlag;
this.slotTitle = slotTitle; this.slotTitle = slotTitle;
this.slotTitleEn = slotTitleEn;
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("title", "hasDatarule"); map.put("title", "hasDatarule");
this.scopedSlots = map; this.scopedSlots = map;
@@ -163,6 +166,14 @@ public class TreeModel implements Serializable {
this.slotTitle = slotTitle; this.slotTitle = slotTitle;
} }
public String getSlotTitleEn() {
return slotTitleEn;
}
public void setSlotTitleEn(String slotTitleEn) {
this.slotTitleEn = slotTitleEn;
}
public Integer getRuleFlag() { public Integer getRuleFlag() {
return ruleFlag; return ruleFlag;
} }