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 @@ + + @@ -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