From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: 星期五, 31 七月 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/src/layout/components/Navbar.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 72bbe06..db46ec5 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -33,11 +33,11 @@
<router-link to="/user/profile">
<el-dropdown-item>涓汉涓績</el-dropdown-item>
</router-link>
- <el-dropdown-item>
- <span @click="setting = true">甯冨眬璁剧疆</span>
+ <el-dropdown-item @click.native="setting = true">
+ <span>甯冨眬璁剧疆</span>
</el-dropdown-item>
- <el-dropdown-item divided>
- <span @click="logout">閫�鍑虹櫥褰�</span>
+ <el-dropdown-item divided @click.native="logout">
+ <span>閫�鍑虹櫥褰�</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -94,7 +94,7 @@
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.reload()
+ location.href = '/index';
})
})
}
--
Gitblit v1.9.3