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