From 4c296d54ca62e29afb518ab06c188a6f3dbd15b8 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 13 Jul 2023 22:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90system=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/org/service/impl/HrOrganizationServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index 97654c9e9..f0a3da329 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -189,6 +189,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) { + // 如果查询带组织机构名称的搜索，则清空其他条件 + if (ObjectUtil.isNotEmpty(commonOrgTreeRequest.getSearchText())) { + commonOrgTreeRequest.setOrgParentId(null); + commonOrgTreeRequest.setIndexOrgIdList(null); + } + // 根据条件查询组织机构列表 LambdaQueryWrapper wrapper = this.createCommonTreeWrapper(commonOrgTreeRequest); wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids,