diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/TopicDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/TopicDto.java
index e4926656..f1ceca40 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/dto/TopicDto.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/dto/TopicDto.java
@@ -18,8 +18,10 @@ public class TopicDto {
     @Data
     @ApiModel("查询题目")
     public static class GetTopic{
+        @NotNull
         @ApiModelProperty("比赛环节 1志在必得 2以快制胜 3绝地反击 4你说我猜")
         private int linkType = 1;
+        @NotNull
         @ApiModelProperty("当前环节的题号")
         private int topicNum;
     }
diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java
new file mode 100644
index 00000000..08c1571f
--- /dev/null
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/TopicDao.java
@@ -0,0 +1,20 @@
+package com.ccsens.mt.persist.dao;
+
+import com.ccsens.mt.bean.vo.TopicVo;
+import com.ccsens.mt.persist.mapper.MtTopicMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author 逗
+ */
+@Repository
+public interface TopicDao extends MtTopicMapper {
+    /**
+     * 查询题目
+     * @param linkType 答题环节类型
+     * @param topicNum 第几道题
+     * @return 返回题目信息
+     */
+    TopicVo.TopicInfo getTopicByLink(@Param("linkType") int linkType, @Param("topicNum")int topicNum);
+}
diff --git a/mt/src/main/java/com/ccsens/mt/service/TopicService.java b/mt/src/main/java/com/ccsens/mt/service/TopicService.java
index a2423fcb..b9fe607c 100644
--- a/mt/src/main/java/com/ccsens/mt/service/TopicService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/TopicService.java
@@ -2,19 +2,26 @@ package com.ccsens.mt.service;
 
 import com.ccsens.mt.bean.dto.TopicDto;
 import com.ccsens.mt.bean.vo.TopicVo;
+import com.ccsens.mt.persist.dao.TopicDao;
 import com.ccsens.mt.persist.dao.GroupDao;
 import com.ccsens.mt.util.Constant;
 import com.ccsens.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @Slf4j
 @Service
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
 public class TopicService implements ITopicService{
 
+    @Resource
+    private TopicDao topicDao;
+
     @Resource
     private RedisUtil redisUtil;
     @Resource
@@ -22,8 +29,8 @@ public class TopicService implements ITopicService{
 
     @Override
     public TopicVo.TopicInfo getTopicByLink(TopicDto.GetTopic getTopic) {
-
-        return null;
+        log.info("查询题目：{}",getTopic.toString());
+        return topicDao.getTopicByLink(getTopic.getLinkType(),getTopic.getTopicNum());
     }
 
     @Override
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index 5889ff7f..5c2cd5c4 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
\ No newline at end of file
+    active: dev
+    include: common, util-dev
\ No newline at end of file
diff --git a/mt/src/main/resources/mapper_dao/TopicDao.xml b/mt/src/main/resources/mapper_dao/TopicDao.xml
new file mode 100644
index 00000000..2d2b8b3e
--- /dev/null
+++ b/mt/src/main/resources/mapper_dao/TopicDao.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.dao.TopicDao">
+
+    <resultMap id="getTopicByLink" type="com.ccsens.mt.bean.vo.TopicVo$TopicInfo">
+        <id column="topicId" property="topicId"/>
+        <result column="description" property="description"/>
+        <result column="answersTrue" property="answersTrue"/>
+        <collection property="options" ofType="String">
+            <id column="options"/>
+        </collection>
+    </resultMap>
+
+
+    <select id="getTopicByLink" parameterType="java.util.Map" resultMap="getTopicByLink">
+       SELECT
+         t.id as topicId,
+         t.description as description,
+         t.answers as answersTrue,
+          if(o.`option` = '',o.contant , 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
+        WHERE
+            t.rec_status = 0
+            and
+            t.link_type = #{linkType}
+            and
+            t.sequence = #{topicNum}
+        ORDER BY o.sequence
+    </select>
+
+</mapper>
\ No newline at end of file