From 56a0073f330283a811c7a4bd09446e2ae110ff75 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 8 Aug 2024 18:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/portal/apiadmin/SysStaffOrgRest.java  |  7 +++++++
 .../portal/biz/sysstafforg/SysStaffOrgMapper.java |  2 ++
 .../portal/biz/sysstafforg/SysStaffOrgMapper.xml  | 15 +++++++++++++++
 .../biz/sysstafforg/SysStaffOrgService.java       |  6 ++++++
 4 files changed, 30 insertions(+)

diff --git a/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
index c2d4857..ce14591 100644
--- a/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java
@@ -159,6 +159,13 @@ public class SysStaffOrgRest {
         return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
     }
 
+    @PostMapping("/selByOrgPath")
+    @ResponseBody
+    @ApiOperation("根据顶级sid查询当前组织下的所有员工(新)")
+    public ResultBean<List<SysStaffOrgByUserVo>> selByOrgPath(@RequestParam("orgSidPath") String orgSidPath) {
+        return sysStaffOrgService.selByOrgPath(orgSidPath);
+    }
+
 
     public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid,String orgSid) {
         return sysStaffOrgService.selectAllByStaffSid(staffSid,"");
diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
index 23f143b..75b1932 100644
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
@@ -120,4 +120,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     List<SysStaffOrgByUserVo> selAllByOrgPath(@Param(Constants.WRAPPER) QueryWrapper qw);
 
     List<SysStaffOrgByUserVo> selAllByOrgSidPath(String orgSidPath);
+
+    List<SysStaffOrgByUserVo> selByOrgPath(String orgSidPath);
 }
\ No newline at end of file
diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
index a5e6e93..256d142 100644
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
@@ -178,4 +178,19 @@
                         ON su.`sid` = sur.`userSid`
         WHERE sur.`orgSid` = #{orgSidPath}
     </select>
+
+    <select id="selByOrgPath" resultType="com.yxt.portal.biz.sysstafforg.SysStaffOrgByUserVo">
+        SELECT
+                su.sid,
+                ss.`name`
+        FROM
+                sys_staff_org so
+                        LEFT JOIN sys_user su
+                        ON so.`staffSid` = su.`staffSid`
+                        LEFT JOIN sys_staffinfo ss
+                        ON so.`staffSid` = ss.`sid`
+                        LEFT JOIN sys_user_role sur
+                        ON su.`sid` = sur.`userSid`
+        WHERE sur.`orgSid` = #{orgSidPath}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
index e4e7bba..1123b9f 100644
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
@@ -348,4 +348,10 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         List<SysStaffOrgByUserVo> sysStaffOrgByUserVoList = baseMapper.selAllByOrgSidPath(orgSidPath);
         return rb.success().setData(sysStaffOrgByUserVoList);
     }
+
+    public ResultBean<List<SysStaffOrgByUserVo>> selByOrgPath(String orgSidPath) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysStaffOrgByUserVo> sysStaffOrgByUserVoList = baseMapper.selByOrgPath(orgSidPath);
+        return rb.success().setData(sysStaffOrgByUserVoList);
+    }
 }
\ No newline at end of file