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);
                     }
                 }