Merge branch 'feat-zyj-1002820' into 'master'

10028201V1社群书未配置群分类时，书刊详情下可看到给个人号配置的资源

See merge request rays/pcloud-book!714

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

@@ -296,8 +296,9 @@
 			B.PUBLISH_DATE, B.COVER_IMG, B.AD_IMG, B.DETAIL, B.`VERSION`,B.BOOK_PRICE,B.ISSN,B.SERIAL_NUMBER,BA.IS_MAIN_EDITOR,			
 	   		IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,START_TIME,END_TIME,BA.TEMPLET_ID,BA.SECOND_TEMPLET_ID,
 			BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint,
-			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.is_open_robot_process
-		FROM 
+			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
+			BA.is_open_robot_process
+		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN 
 		     BOOK B	
@@ -306,6 +307,7 @@
 		     BOOK_TYPE T ON  T.TYPE_CODE = B.TYPE_CODE
 		LEFT JOIN 
 			 BOOK_FUND BF ON BF.BOOK_ID = B.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
+		LEFT JOIN book_group G on G.BOOK_ID = BA.BOOK_ID AND G.CHANNEL_ID = BA.CHANNEL_ID AND G.CREATE_USER = BA.ADVISER_ID AND G.IS_DELETE = 0
          LIMIT 1
 	</select>