Merge commit 'ee3e9ab3a65dd73ef9ccfe230b02f4e31c5dab0f' into dev

app/v1/logic/dataReport/UserLogLogic.php

@@ -196,7 +196,6 @@ class UserLogLogic extends BaseLogic
 
         $rechargeRankQuery->order($orderBy, $orderType);
 
-
         $data = $rechargeRankQuery->paginate($limit)->toArray();
 
         $data['data'] = $this->trandformListColumn($data['data'], ['game', 'auth', 'agent', 'pay_channel']);

plugin/saiadmin/basic/BaseLogic.php

@@ -305,7 +305,7 @@ class BaseLogic
                 $whereOr[] = "(game_id = {$gameId} AND auth_id=0)";
             }
         }
-        $whereRaw = $whereOr ? implode(' OR ', $whereOr) : "";
+        $whereRaw = $whereOr ? implode(' OR ', $whereOr) : "1=1";
 
         return [$where, $whereRaw];
     }