From bf289f2b5a6f233ff0b3ee257fbea16a842fd229 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 14 Aug 2020 09:41:24 +0800
Subject: [PATCH] 0814_1.1

---
 mt/src/main/java/com/ccsens/mt/service/VoteService.java | 2 +-
 mt/src/main/resources/mapper_dao/TopicDao.xml           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mt/src/main/java/com/ccsens/mt/service/VoteService.java b/mt/src/main/java/com/ccsens/mt/service/VoteService.java
index 3efe86a6..425aa54f 100644
--- a/mt/src/main/java/com/ccsens/mt/service/VoteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/VoteService.java
@@ -51,7 +51,7 @@ public class VoteService implements IVoteService{
             if (projectId == null) {
                 projectId = mtGroup.getProjectId();
             } else {
-                if (projectId.longValue() != mtGroup.getId().longValue()) {
+                if (projectId.longValue() != mtGroup.getProjectId().longValue()) {
                     throw new BaseException(CodeEnum.PARAM_ERROR);
                 }
             }
diff --git a/mt/src/main/resources/mapper_dao/TopicDao.xml b/mt/src/main/resources/mapper_dao/TopicDao.xml
index 621e1f26..7bddf26d 100644
--- a/mt/src/main/resources/mapper_dao/TopicDao.xml
+++ b/mt/src/main/resources/mapper_dao/TopicDao.xml
@@ -6,10 +6,12 @@
         <id column="topicId" property="topicId"/>
         <result column="description" property="description"/>
         <result column="answersTrue" property="answersTrue"/>
+        <result column="sequence"  property="sequence"/>
         <collection property="options" ofType="String">
             <id column="options"/>
         </collection>
     </resultMap>
+
     <resultMap id="topicByLink" type="com.ccsens.mt.bean.vo.TopicVo$TopicByLink" >
         <id column="topicId" property="topicId"/>
         <result column="description" property="description"/>
@@ -25,6 +27,7 @@
          t.id as topicId,
          t.description as description,
          t.answers as answersTrue,
+         t.sequence,
          if(o.`option` is null,'' , concat(o.`option` ,':' ,o.contant)) as options
         FROM
         t_mt_topic t LEFT JOIN t_mt_topic_option o on t.id = o.topic_id