Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

app/Http/Controllers/QuickApp/Book/BookController.php

@@ -922,7 +922,7 @@ class BookController extends BaseController
             \Log::info('recommendBooks:6');
             return response()->collection(new BookTransformer(), $list);
         }
-        \Log::info('recommendBooks:7');
+        \Log::info('recommendBooks:7'.json_encode($list));
         return response()->success([]);
     }
 

app/Libs/Helpers.php

@@ -1056,6 +1056,10 @@ if (!function_exists('is_empty')){
     function is_empty($data): bool
     {
         if (is_object($data)){
+            if (method_exists($data,'isEmpty')){
+                return  $data->isEmpty();
+            }
+
             return empty(get_object_vars($data));
         }
 

app/Modules/Channel/Services/ChannelRecommendBooksService.php

@@ -17,7 +17,7 @@ class ChannelRecommendBooksService
 
     static function getMergerBids($channel_id,$bid)
     {
-        $bids = BookConfigService::getAvailableBIdsbyBids(self::getChannelBid($channel_id),$channel_id);
+        $bids = BookConfigService::getAvailableBIdsbyBids(self::getChannelBid($channel_id),$channel_id,false);
         if (empty($bids)){
             return  [];
         }