From 91ca0045fcbf9596157b3b116957e1cb8fb66b89 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 14:54:45 +0800 Subject: [PATCH] =?UTF-8?q?content=20=E6=B4=BB=E5=8A=A8=E5=92=8C=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=BF=AE=E6=94=B9=E6=88=90=20title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/group/ResiGroupDao.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 4076d519be..67577bc380 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -575,14 +575,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} @@ -593,7 +592,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, @@ -737,12 +736,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 ( @@ -756,7 +754,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) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat @@ -798,13 +796,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 ( @@ -817,7 +814,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,