From 715d3392b7d7b0180ca790d8dade4d225aeb7ec6 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 21 May 2022 11:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=9F=A5=E8=AF=A2=E5=B8=A6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=99=E4=B8=8D=E8=BF=9B=E8=A1=8C=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HrOrganizationServiceImpl.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index 501ba35d5..e9b8b424e 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -233,8 +233,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
             }
         }
 
-        // 构建树并返回
-        return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
+        if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName())
+                || ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
+            return treeNodeList;
+        } else {
+            return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
+        }
     }
 
     @Override
@@ -393,7 +397,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName);
 
         // 拼接组织机构编码条件
-        queryWrapper.eq(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode);
+        queryWrapper.like(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode);
 
         // 拼接父机构id查询条件
         if (ObjectUtil.isNotEmpty(orgParentId)) {