From 4ffcd329eb192a19282d2e99e6a5e9604686dfa0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 8 Jan 2021 16:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=EF=BC=8C=E5=B0=86=E7=A9=BA=E7=99=BD=E7=9A=84?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=86=85=E5=AE=B9=E6=9B=BF=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E2=80=9C=E8=AF=AD=E9=9F=B3=E8=AF=9D=E9=A2=98=E2=80=9D=EF=BC=9B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=9B=BE=E7=89=87=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6=E8=A6=81=E5=8A=A0=E4=B8=8A=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/resi/group/constant/TopicConstant.java | 10 ++++++++++ .../topic/service/impl/ResiTopicServiceImpl.java | 2 ++ .../src/main/resources/mapper/topic/ResiTopicDao.xml | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 6a0f97ca92..5aa7c8d3a30 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -107,4 +107,14 @@ public interface TopicConstant { String COMMENT_TOPIC_FAILURE = "评论话题加分失败......"; String GET_CUSTOMER_ID_FAILURE = "查询客户ID失败......"; + + /** + * 字段 附件类型 小写 驼峰 + */ + String FIELD_TOPIC_ATTACHMENT_TYPE_HUMP = "attachmentType"; + + /** + * 字段 附件类型 大写 下划线 + */ + String FIELD_TOPIC_ATTACHMENT_TYPE = "ATTACHMENT_TYPE"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index bd0a6e7963..8dee3181c5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -699,6 +699,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.eq(TopicConstant.TOPIC_ID,topicId); + wrapper.eq(TopicConstant.FIELD_TOPIC_ATTACHMENT_TYPE,"image"); wrapper.orderByAsc(TopicConstant.SORT); List attachments = resiTopicAttachmentDao.selectList(wrapper); List attachmentUrls = new ArrayList<>(); @@ -1249,6 +1250,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId()); + wrapper.eq(TopicConstant.FIELD_TOPIC_ATTACHMENT_TYPE,"image"); wrapper.orderByAsc(TopicConstant.SORT); List attachments = resiTopicAttachmentDao.selectList(wrapper); if (attachments.size() != NumConstant.ZERO){ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 11f21d3c27..fb1ac3a82c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -155,7 +155,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - topic.TOPIC_CONTENT, + IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, @@ -176,6 +176,7 @@ RESI_TOPIC_ATTACHMENT attachment WHERE attachment.DEL_FLAG = '0' + AND attachment.ATTACHMENT_TYPE = 'image' GROUP BY attachment.TOPIC_ID ) attachement2 ON @@ -202,7 +203,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - topic.TOPIC_CONTENT, + IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, @@ -225,6 +226,7 @@ RESI_TOPIC_ATTACHMENT attachment WHERE attachment.DEL_FLAG = '0' + AND attachment.ATTACHMENT_TYPE = 'image' GROUP BY attachment.TOPIC_ID ) attachement2 ON