From 70d35f7d0de1959b11b3b2a2d2114e1d044a1013 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Sep 2025 13:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=AD=89=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E5=91=98=E5=B7=A5=E4=B8=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java | 3 ++-
 src/main/resources/mapper/UserMapper.xml                       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java
index 6b6e5bf..57d202b 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java
+++ b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java
@@ -109,7 +109,7 @@ public class HrServiceImpl implements HrService {
             ArrayList<Tree> treeList = new ArrayList();
             //Long adminorg = 0L;//恒信集团
             //Long adminorg = 309L;//高科企管部
-            Long adminorg = 312L;//高科
+            Long adminorg = 313L;//高科
 
             OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg);
             findAllUnder(orgContType,allWsList);
@@ -258,6 +258,7 @@ public class HrServiceImpl implements HrService {
     private void findAllUnder(OrgContType org, ArrayList<OrgContType> allWsList) {
         List<OrgContType> list = queryLowOrg(org);
         if (list.size() != 0) {
+            org.setPersons(userService.getManContListByAdminOrg(org.getId().toString()));
             for (int i = 0; i < list.size(); i++) {
                 allWsList.add(list.get(i));
                 findAllUnder(list.get(i), allWsList);
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 170821a..ebb1bf0 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -17,6 +17,9 @@
     <select id="getManContListByAdminOrg" resultType="com.hxgk.lowcode.model.entity.Tree">
 
       select `key` as id,admin_org as parentId,name as label from man_cont where admin_org=#{adminOrg} and state = 1
+      <![CDATA[
+        and emp_type < 9
+      ]]>
 
     </select>