Merge branch 'dev_guidance' into develop

4 years ago · e120ac45f6
1 changed files with 1 additions and 1 deletions
--- 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
@ -510,7 +510,7 @@
    </resultMap>
    <resultMap id="NodeTreeResult" type="com.epmet.dto.result.AgencyTreeResultDTO"
               extends="BaseResultMap">
-        <collection property="subAgencyList" column="PID" ofType="com.epmet.dto.result.AgencyTreeResultDTO"
+        <collection property="subAgencyList" column="agencyId" ofType="com.epmet.dto.result.AgencyTreeResultDTO"
                    javaType="java.util.ArrayList" select="getSubAgencyList">
        </collection>
    </resultMap>