From a912b8517309c51bad9c95faa6d4d6acae0592bb Mon Sep 17 00:00:00 2001 From: yzp Date: Tue, 29 Aug 2023 14:34:51 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BE=9B=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=AA=E5=A4=9A=E9=80=89=E6=8B=A9=E4=BC=9A=E6=AF=94=E8=BE=83?= =?UTF-8?q?=E5=9B=B0=E9=9A=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ backend/Magic.Core/Service/Org/SysOrgService.cs | 6 ++++-- frontend/src/views/system/user/addForm.vue | 9 +++++++++ frontend/src/views/system/user/editForm.vue | 9 +++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1229206..f2acb48 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 65d8e91..2a08172 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 /// 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 2a53f53..f47db54 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" > {{ id }} @@ -237,6 +239,8 @@ placeholder="请选择附属机构" treeDefaultExpandAll @change="e => handleChange(e,record.key,col)" + show-search + :filterTreeNode="filterTreeNode" > {{ id }} @@ -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 4f20db9..4fb379b 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" > {{ id }} @@ -209,6 +211,8 @@ :defaultValue="record.extOrgId" treeDefaultExpandAll @change="e => handleChange(e,record.key,col)" + show-search + :filterTreeNode="filterTreeNode" > {{ id }} @@ -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 -- Gitee