From 9f5360de43f0079ed228f0892238466e18dd2b71 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 13 Jul 2023 15:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90org=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AA=E6=9F=A5=E8=AF=A2=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E7=9A=84=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/pojo/request/HrOrganizationRequest.java       | 11 ++++++++++-
 .../org/service/impl/HrOrganizationServiceImpl.java   |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
index feb004511..7660db331 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
@@ -60,7 +60,8 @@ public class HrOrganizationRequest extends BaseRequest {
      */
     @NotBlank(message = "组织编码不能为空", groups = {add.class, edit.class})
     @ChineseDescription("组织编码")
-    @TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "hr_organization", columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true)
+    @TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "hr_organization",
+            columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true)
     private String orgCode;
 
     /**
@@ -123,4 +124,12 @@ public class HrOrganizationRequest extends BaseRequest {
     @ChineseDescription("组织机构id集合")
     private Set<Long> orgIdList;
 
+    /**
+     * 是否只查询公司列表
+     * <p>
+     * true-查询结果只返回公司，false-查询结果返回公司或部门，如果没传这个参数，则都返回
+     */
+    @ChineseDescription("是否只查询公司列表")
+    private Boolean companySearchFlag;
+
 }
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 8c7a8c57d..2c75f03cd 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
@@ -415,6 +415,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
             queryWrapper.in(HrOrganization::getOrgId, subOrgIdListOneLevel);
         }
 
+        // 如果有筛选公司的标识，则只查询公司列表
+        Boolean companySearchFlag = hrOrganizationRequest.getCompanySearchFlag();
+        if (ObjectUtil.isNotEmpty(companySearchFlag) && companySearchFlag) {
+            queryWrapper.eq(HrOrganization::getOrgType, OrgTypeEnum.COMPANY.getCode());
+        }
+
         // 根据排序正序查询
         queryWrapper.orderByAsc(HrOrganization::getOrgSort);