!39 【轻量级PR】组织结构增加税号查询条件

Merge pull request !39 from 叶星/dev-7.2.5

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;
 

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 -> {