diff --git a/.gitignore b/.gitignore
index 12292064249c98c28150a2d77335f0f6638c928b..f2acb48728793f036625f83179262abf2dbabec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,7 @@ bin-release/
 /backend/Magic.Web.Entry/wwwroot/Upload/Avatar
 /backend/Magic.Web.Entry/wwwroot/Upload/Default
 
+/backend/Magic.Web.Entry/wwwroot/ui/**
+/frontend/yarn-error.log
+/backend/Magic.Web.Core/Magic.Web.Core.xml
+/backend/Magic.Application/Magic.Application.xml
diff --git a/backend/Magic.Core/Service/Org/SysOrgService.cs b/backend/Magic.Core/Service/Org/SysOrgService.cs
index 65d8e9112890b29fc7d03330ab044614e8d10fd6..2a0817283f6f2960f21a679d0008aab644b4924e 100644
--- a/backend/Magic.Core/Service/Org/SysOrgService.cs
+++ b/backend/Magic.Core/Service/Org/SysOrgService.cs
@@ -108,7 +108,9 @@ public class SysOrgService : ISysOrgService
     /// <returns></returns>
     public async Task Add(AddOrgInput input)
     {
-        var isExist = await _sysOrgRep.AnyAsync(u => u.Name == input.Name || u.Code == input.Code);
+        // 因为本框架是可以设置多个一级组织机构的，组织机构内部会有重复的部门，以所不应该不允许部门重名
+        // 如果业务层面显示不好区分
+        var isExist = await _sysOrgRep.AnyAsync(u => u.Code == input.Code);
         if (isExist)
             throw Oops.Oh(ErrorCode.D2002);
         if (!UserManager.IsSuperAdmin)
@@ -239,7 +241,7 @@ public class SysOrgService : ISysOrgService
         // 检测数据范围能不能操作这个机构
         sysOrg.Id.CheckDataScope(FilterType.Org);
 
-        var isExist = await _sysOrgRep.AnyAsync(u => (u.Name == input.Name || u.Code == input.Code) && u.Id != sysOrg.Id);
+        var isExist = await _sysOrgRep.AnyAsync(u => (u.Code == input.Code) && u.Id != sysOrg.Id);
         if (isExist)
             throw Oops.Oh(ErrorCode.D2002);
 
diff --git a/frontend/src/views/system/user/addForm.vue b/frontend/src/views/system/user/addForm.vue
index 2a53f53b6d09fb0db0cad032ad2f5671d58c2dd9..f47db548b7c53f2c4d8b3104531acb8c316e2f96 100644
--- a/frontend/src/views/system/user/addForm.vue
+++ b/frontend/src/views/system/user/addForm.vue
@@ -170,6 +170,8 @@
                 placeholder="请选择机构"
                 treeDefaultExpandAll
                 @change="e => initrOrgName(e)"
+                show-search
+                :filterTreeNode="filterTreeNode"
               >
                 <span slot="title" slot-scope="{ id }">{{ id }}</span>
               </a-tree-select>
@@ -237,6 +239,8 @@
                     placeholder="请选择附属机构"
                     treeDefaultExpandAll
                     @change="e => handleChange(e,record.key,col)"
+                    show-search
+                    :filterTreeNode="filterTreeNode"
                   >
                     <span slot="title" slot-scope="{ id }">{{ id }}
                     </span>
@@ -333,6 +337,11 @@
         this.getOrgDate()
         this.getPosList()
       },
+      // 过滤treeselect的数据内容
+      filterTreeNode(inputValue, treeNode) {
+        const title = treeNode.data.props.title.toLowerCase();
+        return title.indexOf(inputValue.toLowerCase()) > -1;
+      },
       /**
        * 增行
        */
diff --git a/frontend/src/views/system/user/editForm.vue b/frontend/src/views/system/user/editForm.vue
index 4f20db9f16c485271cb3f7e326664696bea2e6d4..4fb379bdef5c1e9c9c8f3ede2e492045a5cf2872 100644
--- a/frontend/src/views/system/user/editForm.vue
+++ b/frontend/src/views/system/user/editForm.vue
@@ -139,6 +139,8 @@
                 placeholder="请选择机构"
                 treeDefaultExpandAll
                 @change="e => initrOrgName(e)"
+                show-search
+                :filterTreeNode="filterTreeNode"
               >
                 <span slot="title" slot-scope="{ id }">{{ id }}</span>
               </a-tree-select>
@@ -209,6 +211,8 @@
                       :defaultValue="record.extOrgId"
                       treeDefaultExpandAll
                       @change="e => handleChange(e,record.key,col)"
+                      show-search
+                      :filterTreeNode="filterTreeNode"
                     >
                       <span slot="title" slot-scope="{ id }">{{ id }}</span>
                     </a-tree-select>
@@ -352,6 +356,11 @@
         // 职位信息加入表单
         this.getUserDetaile(record.id)
       },
+      // 过滤treeselect的数据内容
+      filterTreeNode(inputValue, treeNode) {
+        const title = treeNode.data.props.title.toLowerCase();
+        return title.indexOf(inputValue.toLowerCase()) > -1;
+      },
       /**
        * 通过用户ID查询出用户详情，将职位信息填充
        * @param id