From 057bd0aafc39d6d9e2341909cac8d07840e89f50 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 22 Nov 2021 09:58:18 +0800
Subject: [PATCH 1/2] commit

---
 src/components/roleTree/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 1e4eefd67..9abd493f7 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -135,10 +135,7 @@
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList[0].length === 0) {
-                    this.isVisible2 = false
-                    this.$emit('checkedRole', this.roleList)
-                } else if (this.nodeList.length > 0) {
+                if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
                     let ids = ''
                     this.nodeList.forEach(item => {
                         if (ids.length > 0) {

From 9f86ad6f5b19ebfdd5e38340dea1002155ff1b30 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 10:39:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 5c6a3d765..0e0b6cc72 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -527,7 +527,7 @@ export default {
 }
 .nav-menu {
   width: 58px;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   user-select: none;
   box-sizing: border-box;