From 1d6a2b9cbfdefda42cfd98b5adf56466c3726566 Mon Sep 17 00:00:00 2001
From: ShengLong <452591453@qq.com>
Date: Mon, 4 May 2026 17:37:14 +0800
Subject: [PATCH] Update ConversionLogic.php

---
 .../adminapi/logic/stats/ConversionLogic.php  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/app/adminapi/logic/stats/ConversionLogic.php b/server/app/adminapi/logic/stats/ConversionLogic.php
index 99194908..49136ffa 100644
--- a/server/app/adminapi/logic/stats/ConversionLogic.php
+++ b/server/app/adminapi/logic/stats/ConversionLogic.php
@@ -319,9 +319,12 @@ class ConversionLogic
             ->whereNull('a.delete_time');
         if ($visibleAdminIds !== null) {
             if ($visibleAdminIds === []) {
-                return [];
+                // 与 HasDataScopeFilter::applyDataScopeByOwner 对齐：空集合用 0=1 闸门让 SQL 自然返回空，
+                // 避免和"未传 visibleAdminIds (=SCOPE_ALL)"在调用侧产生混淆。
+                $query->whereRaw('0 = 1');
+            } else {
+                $query->whereIn('a.id', $visibleAdminIds);
             }
-            $query->whereIn('a.id', $visibleAdminIds);
         }
 
         return $query
@@ -575,9 +578,11 @@ class ConversionLogic
         }
         if ($visibleAdminIds !== null) {
             if ($visibleAdminIds === []) {
-                return [];
+                // 与 HasDataScopeFilter::applyDataScopeByOwner 对齐：空集合用 0=1 闸门让 SQL 自然返回空。
+                $query->whereRaw('0 = 1');
+            } else {
+                $query->whereIn('a.id', $visibleAdminIds);
             }
-            $query->whereIn('a.id', $visibleAdminIds);
         }
 
         $rows = $query->order('a.id asc')->select()->toArray();
@@ -1798,9 +1803,11 @@ class ConversionLogic
 
         if ($visibleAdminIds !== null) {
             if ($visibleAdminIds === []) {
-                return [];
+                // 与 HasDataScopeFilter::applyDataScopeByOwner 对齐：空集合用 0=1 闸门让 SQL 自然返回空。
+                $query->whereRaw('0 = 1');
+            } else {
+                $query->whereIn('a.id', $visibleAdminIds);
             }
-            $query->whereIn('a.id', $visibleAdminIds);
         }
 
         if ($mediaChannel !== null) {