diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
index dc2624e160..14e9e05aa0 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
@@ -28,4 +28,8 @@ public class BuildingResultDTO implements Serializable {
 
     private String label;
 
+    private String allParentName;
+
+    private String agencyName;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 8d8cc4535e..0b71b79176 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -458,15 +458,19 @@
         n.id AS neighborhoodId,
         n.NEIGHBOR_HOOD_NAME AS neighborhoodName,
         n.GRID_ID,
-        g.GRID_NAME
+        g.GRID_NAME,
+        a.ALL_PARENT_NAME,
+        a.ORGANIZATION_NAME AS AGENCY_NAME
         FROM
         ic_building b
         LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id
         LEFT JOIN customer_grid g ON n.GRID_ID = g.id
+        LEFT JOIN customer_agency a ON a.id = g.pid
         WHERE
         n.DEL_FLAG = '0'
         AND b.DEL_FLAG = '0'
         AND g.DEL_FLAG = '0'
+        AND a.DEL_FLAG = '0'
         AND n.CUSTOMER_ID = #{customerId}
         <if test="gridId != null and gridId != ''">
             AND n.GRID_ID = #{gridId}