From bae38c34c585a0783235601d22ccf0398ac9468b Mon Sep 17 00:00:00 2001
From: wizzercn <wizzer@qq.com>
Date: Thu, 29 Nov 2018 19:02:20 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AE=8C=E5=96=84=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86-=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E6=9D=83=E9=99=90=20=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/sys/SysRoleController.java       |  2 +-
 .../views/platform/sys/role/index.html        | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysRoleController.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysRoleController.java
index 91dadb8df..4e4a87a02 100644
--- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysRoleController.java
+++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysRoleController.java
@@ -219,7 +219,7 @@ public Object menuAll(HttpServletRequest req) {
     @RequiresPermissions("sys.manager.role")
     public Object menuRole(String roleId, HttpServletRequest req) {
         try {
-            List<Sys_menu> userList = sysUserService.getMenusAndButtons(StringUtil.getPlatformUid());
+            List<Sys_menu> userList = sysRoleService.getMenusAndButtons(roleId);
             List<Sys_menu> list;
             if (shiroUtil.hasRole("sysadmin")) {
                 list = sysMenuService.query(Cnd.orderBy().asc("location").asc("path"));
diff --git a/wk-app/wk-nb-web-vue/src/main/resources/views/platform/sys/role/index.html b/wk-app/wk-nb-web-vue/src/main/resources/views/platform/sys/role/index.html
index 6ab0f8a27..91491628b 100644
--- a/wk-app/wk-nb-web-vue/src/main/resources/views/platform/sys/role/index.html
+++ b/wk-app/wk-nb-web-vue/src/main/resources/views/platform/sys/role/index.html
@@ -167,10 +167,15 @@
                 </el-switch>
             </el-form-item>
             <el-form-item prop="" label="分配权限">
+                <el-row style="margin-bottom: 3px;">
+                    <el-button size="small" @click="addRoleSelAll">全选</el-button>
+                    <el-button size="small" @click="addRoleSelClear">清空</el-button>
+                </el-row>
                 <el-tree
                         ref="addMenuTree"
                         :data="addMenuData"
                         show-checkbox
+                        check-strictly
                         node-key="id"
                         :props="defaultProps"
                 >
@@ -272,6 +277,10 @@
             :title="menuDialogTitle"
             :visible.sync="menuDialogVisible"
             width="70%">
+        <el-row style="margin-bottom: 3px;">
+            <el-button size="small" @click="menuRoleSelAll">全选</el-button>
+            <el-button size="small" @click="menuRoleSelClear">清空</el-button>
+        </el-row>
         <el-tree
                 ref="doMenuTree"
                 :data="doMenuData"
@@ -918,6 +927,35 @@
                         });
                     }
                 }, "json");
+            },
+            getTreeAllIds:function(ids,obj){
+                var self=this;
+                if(obj&&obj.length>0){
+                    obj.forEach(function (o) {
+                        ids.push(o.id);
+                        if(o.children){
+                            self.getTreeAllIds(ids,o.children);
+                        }
+                    });
+                }
+            },
+            addRoleSelAll:function () {
+                var self=this;
+                var ids=[];
+                self.getTreeAllIds(ids,self.addMenuData);
+                self.$refs["addMenuTree"].setCheckedKeys(ids);
+            },
+            addRoleSelClear:function () {
+                this.$refs["addMenuTree"].setCheckedKeys([]);
+            },
+            menuRoleSelAll:function () {
+                var self=this;
+                var ids=[];
+                self.getTreeAllIds(ids,self.doMenuData);
+                self.$refs["doMenuTree"].setCheckedKeys(ids);
+            },
+            menuRoleSelClear:function () {
+                this.$refs["doMenuTree"].setCheckedKeys([]);
             }
         },
         created: function () {