From cbfe1267e3a8780637e72c0101f74b49fdaf25b0 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 29 Jun 2023 11:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E3=80=90org=E3=80=91=E6=9B=B4=E6=96=B0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HrOrganizationServiceImpl.java       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
index 2c9e422a6..4770a564e 100644
--- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
@@ -215,7 +215,10 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 去重
         List<HrOrganization> newNotRepeatList = hrOrganizationList.stream().collect(
                 Collectors.collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(HrOrganization::getOrgId))),
-                        ArrayList::new));
+                        LinkedList::new));
+
+        // 从新排序，根据sort字段排序
+        newNotRepeatList.sort(Comparator.comparing(HrOrganization::getOrgSort));
 
         // 构建树形结构
         return new DefaultTreeBuildFactory<HrOrganization>().doTreeBuild(newNotRepeatList);
@@ -367,11 +370,13 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 如果按文本查询条件不为空，则判断组织机构名称、简称、税号、备注是否有匹配
         String searchText = hrOrganizationRequest.getSearchText();
         if (StrUtil.isNotEmpty(searchText)) {
-            queryWrapper.like(HrOrganization::getOrgName, searchText);
-            queryWrapper.or().like(HrOrganization::getOrgShortName, searchText);
-            queryWrapper.or().like(HrOrganization::getTaxNo, searchText);
-            queryWrapper.or().like(HrOrganization::getOrgCode, searchText);
-            queryWrapper.or().like(HrOrganization::getRemark, searchText);
+            queryWrapper.nested(wrap -> {
+                wrap.like(HrOrganization::getOrgName, searchText);
+                wrap.or().like(HrOrganization::getOrgShortName, searchText);
+                wrap.or().like(HrOrganization::getTaxNo, searchText);
+                wrap.or().like(HrOrganization::getOrgCode, searchText);
+                wrap.or().like(HrOrganization::getRemark, searchText);
+            });
         }
 
         // 根据机构状态查询
@@ -383,7 +388,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         if (orgId != null) {
             // 查询orgId对应的所有子机构，包含本orgId
             List<Long> subOrgIdListOneLevel = this.getSubOrgIdListOneLevel(orgId);
-            queryWrapper.nested(i -> i.in(HrOrganization::getOrgId, subOrgIdListOneLevel));
+            queryWrapper.in(HrOrganization::getOrgId, subOrgIdListOneLevel);
         }
 
         // 根据排序正序查询