Merge branch 'wei_master' into '105'

update

See merge request !28

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

@@ -28,6 +28,8 @@
         WHERE
             i.is_delete = 0
         AND rc.first_class_id = #{firstId,jdbcType=BIGINT}
+        GROUP BY i.id
+
         ORDER BY
             i.id DESC
         LIMIT 0,
@@ -81,6 +83,7 @@
         WHERE
             c.is_delete = 0
             AND sc.type = 2
+            AND c.is_up = 1
         AND rc.second_class_id = #{secondId,jdbcType=BIGINT}
         ORDER BY
             c.id DESC
@@ -96,6 +99,7 @@
         WHERE
             c.is_delete = 0
             AND sc.type = 2
+            AND c.is_up = 1
         AND rc.second_class_id = #{secondId,jdbcType=BIGINT}
     </select>
 </mapper>
\ No newline at end of file