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/components/IconSelect/index.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue
index ea4c1b6..a7512b2 100644
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -25,10 +25,9 @@
   },
   methods: {
     filterIcons() {
+      this.iconList = icons
       if (this.name) {
         this.iconList = this.iconList.filter(item => item.includes(this.name))
-      } else {
-        this.iconList = icons
       }
     },
     selectedIcon(name) {

--
Gitblit v1.9.2