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 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=8E=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=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 -> {

From b492e872783c9c12fce291ae43a955fbb082a29b Mon Sep 17 00:00:00 2001
From: ye_star <17705172417@189.cn>
Date: Fri, 14 Oct 2022 17:56:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=A8=8E=E5=8F=B7?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/pojo/organization/HrOrganizationRequest.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
index 14d687a13..8cbb8e5ba 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
@@ -113,6 +113,13 @@ public class HrOrganizationRequest extends BaseRequest {
     /**
      * 税号
      */
+    @TableUniqueValue(
+            message = "企业税号存在重复",
+            groups = {add.class, edit.class},
+            tableName = "hr_organization",
+            columnName = "tax_no",
+            idFieldName = "org_id",
+            excludeLogicDeleteItems = true)
     @ChineseDescription("税号")
     private String taxNo;