Merge remote-tracking branch 'origin/dev_bugfix' into dev

6 years ago · 012a446b54
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
@ -91,7 +91,7 @@
                WHEN ( pi.confirm_result = 'approved' ) THEN 'manual'
            END AS certifyType,
            UNIX_TIMESTAMP(pi.created_time) AS applyTime,
-            organization_type AS extraOrganization,
+            IFNULL(extra_organization,'') AS extraOrganization,
            extra_certifier_name AS contactPeople,
            extra_certifier_mobile AS contactMobile,
            IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address