Merge branch 'dev' into 'master'

增加上架查询条件

See merge request !6

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/ResearchMapper.xml

@@ -208,7 +208,7 @@
             left join tr_research_answer answerf on answer.research_id = tb.id and answerf.account_id = #{accountId} and answerf.finish in(0,1)
             where
             -- 状态、站点
-            tb.deleted = 0 and tb.site_id = #{siteId}
+            tb.deleted = 0 and tb.site_id = #{siteId} and tb.state = 1 
             -- 可见范围
             and (tb.visible_range = 1
             <if test="idsInRange != null and idsInRange.size > 0">