Merge branch 'feat-zyjmaster' into 'master'

基金书筛选包括冻结书

See merge request rays/pcloud-book!109

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

@@ -458,6 +458,7 @@
 		LEFT JOIN BOOK_FUND BF ON  BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		LEFT JOIN book_auth_info I ON I.BOOK_ID = A.BOOK_ID AND I.ADVISER_ID = #{adviserId}
         LEFT JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID AND G.IS_DELETE = 0
+		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
 		WHERE
 			1=1
 		<if test="bookId!=null">
@@ -489,8 +490,10 @@
 			A.IS_MAIN_EDITOR = 1
 		</if>
 		<if test="isFundSupport != null">
-		  AND 
-		  	BF.BOOK_FUND_ID IS NOT NULL
+			AND (
+				BF.BOOK_FUND_ID IS NOT NULL
+				OR f.IS_FREEZE = 1
+			)
 		</if>
 		<if test="templetId != null">
 			AND