Merge branch 'wei_master' into '105'

update

See merge request !30

src/main/resources/mybatis/mapping/CommentMapper.xml

@@ -12,7 +12,7 @@
             t_kzy_comment t
             t_kzy_comment t
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 2
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 2
         WHERE
         WHERE
-            t.is_delete = 0 AND t.auth_status=2
+            t.is_delete = 0 AND t.auth_status=2 AND t.type=2
         AND t.relation_id = #{courseId,jdbcType=BIGINT}
         AND t.relation_id = #{courseId,jdbcType=BIGINT}
         ORDER BY
         ORDER BY
             t.id DESC
             t.id DESC
@@ -25,7 +25,7 @@
             t_kzy_comment t
             t_kzy_comment t
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 2
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 2
         WHERE
         WHERE
-            t.is_delete = 0 AND t.auth_status=2
+            t.is_delete = 0 AND t.auth_status=2 AND t.type=2
         AND t.relation_id = #{courseId,jdbcType=BIGINT}
         AND t.relation_id = #{courseId,jdbcType=BIGINT}
     </select>
     </select>
     <select id="informationCommentList" resultType="java.util.HashMap">
     <select id="informationCommentList" resultType="java.util.HashMap">
@@ -39,7 +39,7 @@
             t_kzy_comment t
             t_kzy_comment t
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         WHERE
         WHERE
-            t.is_delete = 0 AND t.auth_status=2
+            t.is_delete = 0 AND t.auth_status=2 AND t.type=1
         AND t.relation_id = #{informationId,jdbcType=BIGINT}
         AND t.relation_id = #{informationId,jdbcType=BIGINT}
         ORDER BY
         ORDER BY
             t.id DESC
             t.id DESC
@@ -52,7 +52,7 @@
             t_kzy_comment t
             t_kzy_comment t
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         WHERE
         WHERE
-            t.is_delete = 0 AND t.auth_status=2
+            t.is_delete = 0 AND t.auth_status=2 AND t.type=1
         AND t.relation_id = #{informationId,jdbcType=BIGINT}
         AND t.relation_id = #{informationId,jdbcType=BIGINT}
     </select>
     </select>