From da28dff897a45d8e49181e9e800c95eeb9984698 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 30 Sep 2022 11:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E5=85=AC=E5=8F=B8=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=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 +++++
 .../sysorganization/SysOrganizationListsVo.java | 17 +++++++++++++++++
 .../sysorganization/SysOrganizationMapper.java  |  1 +
 .../sysorganization/SysOrganizationMapper.xml   |  6 ++++++
 .../sysorganization/SysOrganizationRest.java    |  5 +++++
 .../sysorganization/SysOrganizationService.java | 12 ++++++++++++
 7 files changed, 51 insertions(+)
 create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java

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 879377e42e..ffd6fa92bb 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
@@ -139,4 +139,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("当前分公司销售部门及部门人员")
     ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectOrgLists")
+    @ResponseBody
+    @ApiOperation("当前分公司下所有部门")
+    ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
 }
\ No newline at end of file
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 a7bd307be5..2c64662f4d 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
@@ -142,4 +142,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
new file mode 100644
index 0000000000..a93ab2d4d1
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 11:28
+ * @Description
+ */
+@Data
+public class SysOrganizationListsVo implements Vo {
+    private static final long serialVersionUID = -7021974833444298712L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+}
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 d10355bfe8..40a43556b5 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
@@ -106,6 +106,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrgVo getListOrgByBrand(String sid);
 
     List<SysOrganizationListVo> selectOrgList(String orgSid);
+    List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(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 9a0dd40813..b6a16a4e9b 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
@@ -181,6 +181,12 @@
           and orgAttributeKey = 'DP03_SYS'
     </select>
 
+    <select id="selectOrgLists" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListsVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+    </select>
+
     <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
         select distinct si.name staffName, si.sid staffSid
         from sys_staff_org so
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 eaa7f0230c..0e6a71822d 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
@@ -361,4 +361,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
         return sysOrganizationService.selectOrgList(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 31f1711941..114f94ca94 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
@@ -495,4 +495,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         return rb.success().setData(sysOrganizationListVos);
     }
+
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListsVo>> rb = ResultBean.fireFail();
+        //根据用户sid查询分公司sid
+        String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+        String orgSid = getOrgSid(orgDeptSid);
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListsVo> sysOrganizationListVos = baseMapper.selectOrgLists(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        return rb.success().setData(sysOrganizationListVos);
+
+    }
 }
\ No newline at end of file