From e0d9069886a4b790df97071b6311f0af29c2b4fc Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 6 Dec 2023 13:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=A6=BB=E8=81=8C=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E9=94=80=E5=94=AE=E4=B8=93=E5=91=98=E5=8F=8A?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sysorganization/SysOrganizationFeign.java |  5 ++++
 .../SysOrganizationFeignFallback.java         |  5 ++++
 .../SysOrganizationMapper.java                |  2 ++
 .../sysorganization/SysOrganizationMapper.xml |  8 +++++++
 .../sysorganization/SysOrganizationRest.java  |  5 ++++
 .../SysOrganizationService.java               | 23 +++++++++++++++++++
 6 files changed, 48 insertions(+)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
index afdca7b55c..d410e03ea1 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
@@ -155,6 +155,11 @@ public interface SysOrganizationFeign {
     @ApiOperation("当前分公司销售部门及部门人员")
     ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
 
+    @GetMapping("/selectOrgList2")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList2(@SpringQueryMap SysOrganizationListQuery query);
+
     @GetMapping("/selectOrgLists")
     @ResponseBody
     @ApiOperation("当前分公司下所有部门")
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
index bdddd3ed86..41fd3e4281 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
@@ -157,6 +157,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return null;
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
index 0b4e98f519..056664224e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
@@ -126,4 +126,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
 
     List<SysFinanceVo> selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
index 00b2688fbf..8a1ff7d1d6 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
@@ -196,6 +196,14 @@
           and si.personTypeKey != '01'
     </select>
 
+    <select id="selectByOrgDeptSid2" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid, su.sid userSid
+        from sys_staff_org so
+        left join sys_staffinfo si on so.staffSid = si.sid
+        left join sys_user su on su.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
+
     <select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         select *
         from sys_organization
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
index c4fe3bd7b6..cd6f36fc7f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@@ -413,6 +413,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return sysOrganizationService.selectOrgList(query);
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        return sysOrganizationService.selectOrgList2(query);
+    }
+
     @Override
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return sysOrganizationService.selectOrgLists(query);
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
index 6349626d72..7f4d1552d1 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@@ -691,4 +691,27 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         return rb.success().setData(orgPath);
     }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListVo>> rb = ResultBean.fireFail();
+        String orgSid = "";
+        String orgDeptSid = "";
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
+        } else {
+            orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+            orgSid = getOrgSid(orgDeptSid);
+        }
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListVo> sysOrganizationListVos = baseMapper.selectOrgList(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        if (!sysOrganizationListVos.isEmpty()) {
+            for (SysOrganizationListVo vo : sysOrganizationListVos) {
+                orgDeptSid = vo.getOrgDeptSid();
+                List<SysOrgStaffVo> sysOrgStaffVoList = baseMapper.selectByOrgDeptSid2(orgDeptSid);
+                vo.setStaffinfoVoList(sysOrgStaffVoList);
+            }
+        }
+        return rb.success().setData(sysOrganizationListVos);
+    }
 }
\ No newline at end of file