From 38ca4218d007388ac035275160f0797e917ba3c9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 2 Mar 2021 10:27:25 +0800
Subject: [PATCH] =?UTF-8?q?ext=E6=9F=A5=E8=AF=A2staff=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8CagencyPath=E5=8C=85=E6=8B=AC=E6=9C=AC?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerAgencyDao.xml    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index e7f2621649..87f00d6652 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -175,8 +175,8 @@
        SELECT
         agency.ID AS agencyId,
         agency.ORGANIZATION_NAME AS agencyName,
-        agency.PIDS AS agencyIdPath,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
+		IF(TRIM(IFNULL(agency.ALL_PARENT_NAME,'')) = ''  ,agency.ORGANIZATION_NAME,CONCAT(agency.ALL_PARENT_NAME,':',agency.ORGANIZATION_NAME)) AS agencyNamePath,
         agency.CUSTOMER_ID AS customerId
     FROM
      CUSTOMER_STAFF_AGENCY staff
@@ -188,12 +188,12 @@
 
     <!-- 查询一个工作人员最近登录的网格以及机关信息 -->
     <select id="selectAgencyAndGridInfoExt" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
-    SELECT
+        SELECT
         gridd.GRID_NAME,
         agency.ID AS agencyId,
         agency.ORGANIZATION_NAME AS agencyName,
-        agency.PIDS AS agencyIdPath,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
+		IF(TRIM(IFNULL(agency.ALL_PARENT_NAME,'')) = ''  ,agency.ORGANIZATION_NAME,CONCAT(agency.ALL_PARENT_NAME,':',agency.ORGANIZATION_NAME)) AS agencyNamePath,
         agency.CUSTOMER_ID AS customerId
     FROM
         CUSTOMER_GRID gridd