Merge remote-tracking branch 'origin/dev_resi_event' into develop

4 years ago · 672150d7c1
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
@ -114,8 +114,8 @@
          AND sa.USER_ID = #{userId}
        UNION ALL
        SELECT
-            sg.GRID_ID AS gridId,
            cg.PID AS agencyId,
+            sg.GRID_ID AS gridId,
            cg.GRID_NAME AS gridName
        FROM customer_staff_grid sg
        LEFT JOIN customer_grid cg ON (cg.ID = sg.GRID_ID AND cg.DEL_FLAG = 0)