From a41f2d1cb954494ec70ce4a8f8b9989e7aead5ff Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 8 Apr 2020 17:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AF=9D=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java     | 5 +----
 .../src/main/resources/mapper/topic/ResiTopicDao.xml         | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

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 a246d751d2..2249441579 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
@@ -57,9 +57,7 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -203,7 +201,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 attachment.setAttachmentUrl(url);
                 attachment.setTopicId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(url.substring(url.lastIndexOf("\\.") + 1).toLowerCase());
+                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + 1).toLowerCase());
                 attachment.setSort(sort++);
                 resiTopicAttachmentDao.insertOne(attachment);
             }
@@ -287,7 +285,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {
-
         if (null == tokenDto) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
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 6d13caa557..0baa4f4771 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
@@ -112,7 +112,7 @@
          SELECT
           attachment.TOPIC_ID AS attachmentTopicId,
           attachment.ATTACHMENT_URL as firstPhoto,
-          MIN(attachment.SORD)
+          MIN(attachment.SORT)
           FROM
           RESI_TOPIC_ATTACHMENT attachment
           WHERE