Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

5 years ago · 3ac2ee220e
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
@ -24,7 +24,7 @@
    <!-- 查询客户对应的根级组织 -->
    <select id="selectStaffOrgList" parameterType="map" resultType="com.epmet.dto.result.StaffOrgsResultDTO">
        SELECT
-            ca.pid AS rootAgencyId,
+            ca.id AS rootAgencyId,
            ca.ORGANIZATION_NAME AS rootAgencyName,
            ca.CUSTOMER_ID AS customerId
        FROM