From 22f403b3ec2adabe28deeead5c159ad1f9ae8d56 Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Mon, 18 Mar 2019 19:12:12 +0800
Subject: [PATCH] 暂时还原
---
jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
index 28588f8..e7ca64c 100644
--- a/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -78,7 +78,7 @@ public class SysPermissionController {
/**
- * 查询用户拥有的菜单权限和按钮权限（根据用户账号）
+ * 查询用户的权限
* @return
*/
@RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
@@ -118,7 +118,7 @@ public class SysPermissionController {
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
@RequiresRoles({"admin"})
- public Result<SysPermission> edit(@RequestBody SysPermission permission) {
+ public Result<SysPermission> eidt(@RequestBody SysPermission permission) {
Result<SysPermission> result = new Result<>();
try {
sysPermissionService.editPermission(permission);
@@ -264,12 +264,12 @@ public class SysPermissionController {
SysPermissionTree tree = new SysPermissionTree(permission);
if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
- if(!tree.getIsLeaf()) {
+ if(tree.getIsLeaf()==0) {
getTreeList(treeList, metaList, tree);
}
}else if(temp!=null && tempPid!=null && tempPid.equals(temp.getId())){
temp.getChildren().add(tree);
- if(!tree.getIsLeaf()) {
+ if(tree.getIsLeaf()==0) {
getTreeList(treeList, metaList, tree);
}
}
@@ -283,12 +283,12 @@ public class SysPermissionController {
TreeModel tree = new TreeModel(permission);
if(temp==null && oConvertUtils.isEmpty(tempPid)) {
treeList.add(tree);
- if(!tree.getIsLeaf()) {
+ if(permission.getIsLeaf()==0) {
getTreeModelList(treeList, metaList, tree);
}
}else if(temp!=null && tempPid!=null && tempPid.equals(temp.getKey())){
temp.getChildren().add(tree);
- if(!tree.getIsLeaf()) {
+ if(permission.getIsLeaf()==0) {
getTreeModelList(treeList, metaList, tree);
}
}
@@ -310,12 +310,11 @@ public class SysPermissionController {
JSONObject json = getPermissionJsonObject(permission);
if(parentJson==null && oConvertUtils.isEmpty(tempPid)) {
jsonArray.add(json);
- if(!permission.isLeaf()) {
+ if(permission.getIsLeaf()==0) {
getPermissionJsonArray(jsonArray, metaList, json);
}
}else if(parentJson!=null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){
- //类型( 0：一级菜单 1：子菜单 2：按钮 )
- if(permission.getMenuType()==2) {
+ if(permission.getMenuType()==0) {
JSONObject metaJson = parentJson.getJSONObject("meta");
if(metaJson.containsKey("permissionList")) {
metaJson.getJSONArray("permissionList").add(json);
@@ -324,8 +323,8 @@ public class SysPermissionController {
permissionList.add(json);
metaJson.put("permissionList", permissionList);
}
- //类型( 0：一级菜单 1：子菜单 2：按钮 )
- }else if(permission.getMenuType()==1|| permission.getMenuType()==0) {
+
+ }else if(permission.getMenuType()==1) {
if(parentJson.containsKey("children")) {
parentJson.getJSONArray("children").add(json);
}else {
@@ -334,7 +333,7 @@ public class SysPermissionController {
parentJson.put("children", children);
}
- if(!permission.isLeaf()) {
+ if(permission.getIsLeaf()==0) {
getPermissionJsonArray(jsonArray, metaList, json);
}
}
@@ -406,4 +405,4 @@ public class SysPermissionController {
}
}
-}
+}
\ No newline at end of file
--
libgit2 0.22.2