From 32ad450ca5eebb91fa159e03c6d95e24f7db6995 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 23 Sep 2021 11:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/govorg/CustomerAgencyDao.java         | 25 +++++++++++++++--
 .../mapper/govorg/CustomerAgencyDao.xml       | 27 +++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
index 673d317fe6..bd29030255 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@@ -71,10 +71,31 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId);
-
+    /**
+     * @Description 工作端组织级下级组织树
+     * @Param agencyId
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
     OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId);
     List<OrgTreeResultDTO> getSubOrgList(@Param("pid") String pid);
-
+    /**
+     * @Description 居民端组织级下级组织树
+     * @Param agencyId
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
     OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId);
     List<OrgTreeResultDTO> getResiSubOrgList(@Param("pid") String pid);
+
+    /**
+     * @Description 工作人员所在的组织，部门，网格
+     * @Param staffId
+     * @Return {@link List< String>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/23 10:16
+     */
+    List<String> getOrgList(@Param("staffId") String staffId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index d47b736984..aa345e87b3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -201,7 +201,7 @@
         select
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
-            'agency' AS orgName,
+            'agency' AS orgType,
             CONCAT(PIDS,ID) AS orgPids
 
         from
@@ -253,7 +253,7 @@
         select
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
-            'agency' AS orgName,
+            'agency' AS orgType,
             CONCAT(PIDS,ID) AS orgPids
 
         from
@@ -262,5 +262,28 @@
              DEL_FLAG = 0
             AND ID = #{agencyId}
     </select>
+    <select id="getOrgList" resultType="java.lang.String">
+        SELECT
+            AGENCY_ID AS orgId
+        FROM
+            customer_staff_agency
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            GRID_ID AS orgId
+        FROM
+            customer_staff_grid
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId} UNION
+        SELECT
+            DEPARTMENT_ID AS orgId
+        FROM
+            customer_staff_department
+        WHERE
+            DEL_FLAG = '0'
+            AND USER_ID = #{staffId}
+    </select>
 
 </mapper>