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

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -46,7 +46,7 @@
         SELECT
             so.ORGANIZATION_NAME AS organizationName,
             so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount,
-            DATE_FORMAT(so.ORGANIZATION_CREATED_TIME,'%Y-%m-%d') AS organizationCreatedTime,
+            IFNULL(DATE_FORMAT(so.ORGANIZATION_CREATED_TIME,'%Y-%m-%d'),DATE_FORMAT(so.CREATED_TIME,'%Y-%m-%d')) AS organizationCreatedTime,
             so.PRINCIPAL_NAME AS principalName,
             so.PRINCIPAL_PHONE AS principalPhone,
             so.SERVICE_ITEM AS serviceItem,