From a708165f1afa49f484c4a999cec2d9bd26966bad Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 30 Aug 2021 16:30:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E3=80=81?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E9=83=A8=E9=97=A8/=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmetuser/impl/EpmetUserServiceImpl.java   |  1 +
 .../com/epmet/controller/CustomerAgencyController.java | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 0f3c738d8f..b53313b3e7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -644,6 +644,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         List<String> list = staffRoleDao.selectByStaffId(staffId);
         //汇总数据
         result = ConvertUtils.sourceToTarget(dto, StaffDetailV2FormDTO.class);
+        result.setStaffId(dto.getUserId());
         result.setName(dto.getRealName());
         result.setGender(dto.getGender().toString());
         result.setRoles(list);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index bb6308fd11..963c8b7b95 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -302,4 +302,14 @@ public class CustomerAgencyController {
     public Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId){
      return new Result<String>().ok(customerOrgParameterService.getAreaCodeSwitch(customerId));
     }
+
+    /**
+     * @Description 【通讯录】查询当前人员所属组织、组织下部门/网格树
+     * @author sun
+     **/
+    @PostMapping("orgtree")
+    Result<ExtStaffPermissionResultDTO> orgTree(@LoginUser TokenDto tokenDto){
+        return new Result<ExtStaffPermissionResultDTO>().ok(customerAgencyService.staffPermissionExt(tokenDto.getUserId()));
+    }
+
 }
\ No newline at end of file

From e0bffddd73df604c22e1073e7945d8e0ab379414 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 30 Aug 2021 16:48:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E9=97=A8/=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8B=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E4=BB=8E=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E9=80=89=E6=97=B6=20=E5=8F=AA=E8=83=BD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=9C=A8=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/CustomerStaffAgencyDao.xml         | 88 ++++++++++---------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
index c62306039f..5f471060b6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
@@ -41,58 +41,62 @@
 
     <!-- 查询当前网格所属机构下的不在此网格的工作人员Id -->
     <select id="getSelectableStaffsForGrid" parameterType="string" resultType="string">
-      SELECT
-	    agency.USER_ID
-      FROM
-	    CUSTOMER_STAFF_AGENCY agency
-      WHERE
-	    agency.DEL_FLAG = '0'
-	  AND agency.AGENCY_ID = (
         SELECT
-	        PID
+            agency.user_id
         FROM
-	        CUSTOMER_GRID
+	        customer_staff_agency agency
+	    INNER JOIN staff_org_relation sor ON agency.user_id = sor.staff_id AND sor.org_type = 'agency'
         WHERE
-	        DEL_FLAG = '0'
-	    AND ID = #{gridId})
-
-	  AND agency.USER_ID NOT IN (
-        SELECT
-	        USER_ID
-        FROM
-	        CUSTOMER_STAFF_GRID
-        WHERE
-	        DEL_FLAG = '0'
-	    AND
-	       GRID_ID = #{gridId} )
+            agency.del_flag = '0'
+	    AND agency.agency_id = (
+            SELECT
+                pid
+            FROM
+                customer_grid
+            WHERE
+                del_flag = '0'
+            AND id = #{gridId}
+        )
+	    AND agency.user_id NOT IN (
+            SELECT
+	            user_id
+            FROM
+	            customer_staff_grid
+            WHERE
+	            del_flag = '0'
+	        AND
+	            grid_id = #{gridId}
+	    )
     </select>
 
     <!-- 查询当前部门所属机构下的不在此部门的工作人员Id -->
     <select id="getSelectableStaffsForDept" parameterType="string" resultType="string">
         SELECT
-        agency.USER_ID
+            agency.user_id
         FROM
-        CUSTOMER_STAFF_AGENCY agency
+            customer_staff_agency agency
+        INNER JOIN staff_org_relation sor ON agency.user_id = sor.staff_id AND sor.org_type = 'agency'
         WHERE
-        agency.DEL_FLAG = '0'
-        AND agency.AGENCY_ID = (
-        SELECT
-        AGENCY_ID
-        FROM
-        CUSTOMER_DEPARTMENT
-        WHERE
-        DEL_FLAG = '0'
-        AND ID = #{departmentId})
-
-        AND agency.USER_ID NOT IN (
-        SELECT
-        USER_ID
-        FROM
-        CUSTOMER_STAFF_DEPARTMENT
-        WHERE
-        DEL_FLAG = '0'
-        AND
-        DEPARTMENT_ID = #{departmentId} )
+            agency.del_flag = '0'
+        AND agency.agency_id = (
+            SELECT
+                agency_id
+            FROM
+                customer_department
+            WHERE
+                del_flag = '0'
+            AND id = #{departmentId}
+        )
+        AND agency.user_id NOT IN (
+            SELECT
+                user_id
+            FROM
+                customer_staff_department
+            WHERE
+                del_flag = '0'
+            AND
+                department_id = #{departmentId}
+        )
     </select>
 
     <select id="selectAgencyStaffList" resultType="com.epmet.dto.result.StaffListResultDTO">