Merge branch 'feat-1002531' into 'master'

知识商城展现已下印图书

See merge request rays/pcloud-book!538

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -665,7 +665,8 @@
 		LEFT JOIN book b ON bg.book_id = b.BOOK_ID
 		LEFT JOIN book_fund bf ON bg.book_id = bf.BOOK_ID AND bf.END_TIME <![CDATA[ > ]]> NOW() AND bf.START_TIME <![CDATA[ < ]]> NOW()
 		LEFT JOIN book_group_classify bgc ON bg.id = bgc.book_group_id
-		WHERE bg.channel_id = #{channelId}
+		LEFT JOIN book_adviser ba ON b.BOOK_ID =ba.book_id
+		WHERE bg.channel_id = #{channelId} and ba.IS_PRINT=1
 		<if test="keywords != null">
 			AND (b.ISBN like CONCAT('%',#{keywords},'%') OR b.BOOK_NAME like CONCAT('%',#{keywords},'%') OR bg.group_qrcode_name like CONCAT('%',#{keywords},'%'))
 		</if>