Merge branch 'fixbug-rsy' into 'master'

修改下配置资源条件

See merge request rays/pcloud-book!236

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

@@ -571,7 +571,14 @@
         LEFT JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID
 		LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
 		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_GROUP_SERVE bgs on G.id=bgs.book_group_id
+		<choose>
+			<when test="joinGroupType!=null and joinGroupType==2">
+				LEFT JOIN BOOK_GROUP_SERVE bgs on G.id=bgs.book_group_id
+			</when>
+			<otherwise>
+				LEFT JOIN BOOK_KEYWORD bgs on G.id=bgs.book_group_id and  bgs.is_delete=0
+			</otherwise>
+		</choose>
 		WHERE
             G.create_user = #{adviserId} AND G.is_delete = 0
         AND (