From 3e3c1d75d9b5b78aa32e45e31aa18a623c35dfc2 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Wed, 6 Nov 2019 15:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/roleFunctions.html             | 13 +++++++------
 .../com/jsh/erp/controller/FunctionsController.java |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/erp_web/pages/manage/roleFunctions.html b/erp_web/pages/manage/roleFunctions.html
index 83abbd58..b0210636 100644
--- a/erp_web/pages/manage/roleFunctions.html
+++ b/erp_web/pages/manage/roleFunctions.html
@@ -48,16 +48,17 @@
             }
         }
         //cnodes = cnodes.substring(0, cnodes.length - 1);
-        pnodes = pnodes.substring(0, pnodes.length - 1);
+        // pnodes = pnodes.substring(0, pnodes.length - 1);
 
         if (ctype == 'child') {
             return cnodes;
         }
-        else {
-            return pnodes
+        else if("all"){
+            return cnodes+pnodes;
+        }else{
+            return pnodes;
         }
-        ;
-    };
+    }
 
     $(function () {
 
@@ -84,7 +85,7 @@
                             info: JSON.stringify({
                                 type: type,
                                 keyid: url_id,
-                                value: GetNode('child')
+                                value: GetNode('all')
                             })
                         },
                         dataType: "json",
diff --git a/src/main/java/com/jsh/erp/controller/FunctionsController.java b/src/main/java/com/jsh/erp/controller/FunctionsController.java
index f524664d..85a16c91 100644
--- a/src/main/java/com/jsh/erp/controller/FunctionsController.java
+++ b/src/main/java/com/jsh/erp/controller/FunctionsController.java
@@ -154,9 +154,10 @@ public class FunctionsController {
                     if(("admin").equals(loginName)) {
                         dataList.add(fun);
                     } else {
-                        if(!("系统管理").equals(fun.getName())) {
-                            dataList.add(fun);
-                        }
+//                        if(!("系统管理").equals(fun.getName())) {
+//                            dataList.add(fun);
+//                        }
+                        dataList.add(fun);
                     }
                 }