From 0cae7d0058e96701671923bff5269edb70236a69 Mon Sep 17 00:00:00 2001
From: FlyFive <826323891@qq.com>
Date: Mon, 12 Oct 2020 13:50:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20ruoyi-ui/src/views/system/role/ind?=
 =?UTF-8?q?ex.vue.=20getMenuAllCheckedKeys()=E6=96=B9=E6=B3=95=E4=B8=AD?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=8A=82=E7=82=B9=E5=92=8C=E5=8D=8A=E9=80=89?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=8E=B7=E5=8F=96=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8F=8D=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/role/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index bdaa90da..7835eb6b 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -377,9 +377,9 @@ export default {
     // 所有部门节点数据
     getDeptAllCheckedKeys() {
       // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getHalfCheckedKeys();
+      let checkedKeys = this.$refs.dept.getCheckedKeys();
       // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getCheckedKeys();
+      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
       checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
       return checkedKeys;
     },

From 08df2c93a9fdeb25aecc064d13281c7f82db3cd1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 13 Oct 2020 14:41:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/dict/index.vue | 4 +---
 ruoyi-ui/src/views/system/role/index.vue | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
index 7c90814b..c1de85af 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -352,9 +352,7 @@ export default {
     /** 清理缓存按钮操作 */
     handleClearCache() {
       clearCache().then(response => {
-        if (response.code === 200) {
-          this.msgSuccess("清理成功");
-        }
+        this.msgSuccess("清理成功");
       });
     }
   }
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 7835eb6b..279c466b 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -368,9 +368,9 @@ export default {
     // 所有菜单节点数据
     getMenuAllCheckedKeys() {
       // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getHalfCheckedKeys();
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
       // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getCheckedKeys();
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
       checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
       return checkedKeys;
     },
@@ -440,7 +440,7 @@ export default {
         menuIds: [],
         deptIds: [],
         menuCheckStrictly: true,
-		deptCheckStrictly: true,
+        deptCheckStrictly: true,
         remark: undefined
       };
       this.resetForm("form");