Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -576,14 +576,13 @@
                  ai.ID,
                  ai.CREATED_BY AS userId,
                  DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                 IFNULL(ac.CONTENT,'') AS content,
+                 IFNULL(ai.TITLE,'') AS content,
                  ai.`STATUS` AS status,
                  '' AS issueId,
                  'act' AS contentType,
                  IFNULL(ac2.CONTENT,'') AS firstPhoto,
                  false AS isExpirat
              FROM group_act_info ai
-             LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' AND ac.DEL_FLAG = 0 AND ac.sort = 1
              LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
              WHERE ai.DEL_FLAG = '0'
                AND ai.GROUP_ID = #{groupId}
@@ -594,7 +593,7 @@
                   n.ID,
                   n.CREATED_BY AS userId,
                   DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                  n.CONTENT AS content,
+                  n.TITLE AS content,
                   '' AS status,
                   '' AS issueId,
                   'notice' AS contentType,
@@ -738,12 +737,11 @@
                      ai.ID,
                      ai.CREATED_BY AS userId,
                      DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                     IFNULL(ac.CONTENT,'') AS content,
+                     IFNULL(ai.TITLE,'') AS content,
                      'act' AS contentType,
                      IFNULL(ac2.CONTENT,'') AS firstPhoto,
                      false AS isExpirat
                  FROM group_act_info ai
-                 LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text'
                  LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1
                  WHERE ai.DEL_FLAG = '0'
                     AND (
@@ -757,7 +755,7 @@
                      n.ID,
                      n.CREATED_BY AS userId,
                      DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                     n.CONTENT AS content,
+                     n.TITLE AS content,
                      'notice' AS contentType,
                      IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto,
                      (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat
@@ -814,13 +812,12 @@
                  ai.ID,
                  ai.CREATED_BY AS userId,
                  DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                 IFNULL(ac.CONTENT,'') AS content,
+                 IFNULL(ai.TITLE,'') AS content,
                  ai.`STATUS` AS status,
                  '' AS issueId,
                  'act' AS contentType,
                  false AS isExpirat
              FROM group_act_info ai
-             LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text'
              WHERE ai.DEL_FLAG = '0'
              AND (
                      <foreach collection="ids" item="id" separator=" OR ">
@@ -833,7 +830,7 @@
                   n.ID,
                   n.CREATED_BY AS userId,
                   DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
-                  n.CONTENT AS content,
+                  n.TITLE AS content,
                   '' AS status,
                   '' AS issueId,
                   'notice' AS contentType,