From 3b78f2179f418a7379be5726f005ed9e363eb155 Mon Sep 17 00:00:00 2001
From: ye_star <17705172417@189.cn>
Date: Fri, 14 Oct 2022 17:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/HrOrganizationServiceImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 857ccdc3d..af7342944 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
@@ -447,6 +447,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         Long orgParentId = hrOrganizationRequest.getOrgParentId();
         Long orgId = hrOrganizationRequest.getOrgId();
         Integer orgType = hrOrganizationRequest.getOrgType();
+        String taxNo = hrOrganizationRequest.getTaxNo();
 
         // 拼接组织机构名称条件
         queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName);
@@ -457,6 +458,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 组织机构类型拼接
         queryWrapper.eq(ObjectUtil.isNotEmpty(orgType), HrOrganization::getOrgType, orgType);
 
+        // 税号查询条件
+        queryWrapper.eq(StrUtil.isNotEmpty(taxNo), HrOrganization::getTaxNo, taxNo);
+
         // 拼接父机构id查询条件
         if (ObjectUtil.isNotEmpty(orgParentId)) {
             queryWrapper.and(qw -> {