From d05cfc58eacbc97e9c8ee1494de30d180e4b16b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Tue, 15 Apr 2025 12:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=90=8E=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=B1=A0=E5=88=97=E8=A1=A8=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superadmin/controller/TrafficPoolController.php           | 4 ++--
 SuperAdmin/app/dashboard/customers/page.tsx                   | 4 ++--
 SuperAdmin/lib/traffic-pool-api.ts                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Server/application/superadmin/controller/TrafficPoolController.php b/Server/application/superadmin/controller/TrafficPoolController.php
index 8eac8ab8..9471ee0e 100644
--- a/Server/application/superadmin/controller/TrafficPoolController.php
+++ b/Server/application/superadmin/controller/TrafficPoolController.php
@@ -28,8 +28,8 @@ class TrafficPoolController extends Controller
         
         // 构建查询
         $query = TrafficPoolModel::alias('tp')
-            ->join('traffic_source ts', 'tp.identifier = ts.identifier', 'INNER')
-            ->join('company c', 'ts.companyId = c.id', 'LEFT')
+            ->join('traffic_source ts', 'tp.identifier = ts.identifier', 'RIGHT')
+            ->join('company c', 'ts.companyId = c.companyId', 'LEFT')
             ->join('wechat_account wa', 'tp.wechatId = wa.wechatId', 'LEFT')
             ->join('wechat_tag wt', 'wa.wechatId = wt.wechatId')
             ->field([
diff --git a/SuperAdmin/app/dashboard/customers/page.tsx b/SuperAdmin/app/dashboard/customers/page.tsx
index e966abc7..1c3386f7 100644
--- a/SuperAdmin/app/dashboard/customers/page.tsx
+++ b/SuperAdmin/app/dashboard/customers/page.tsx
@@ -352,8 +352,8 @@ export default function CustomersPage() {
                     </TableCell>
                     <TableCell>{customer.region}</TableCell>
                     <TableCell>{customer.source}</TableCell>
-                    <TableCell>{customer.companyName}</TableCell>
-                    <TableCell>{customer.createTime}</TableCell>
+                    <TableCell>{customer.projectName}</TableCell>
+                    <TableCell>{customer.addTime}</TableCell>
                     <TableCell className="text-right">
                       <DropdownMenu>
                         <DropdownMenuTrigger asChild>
diff --git a/SuperAdmin/lib/traffic-pool-api.ts b/SuperAdmin/lib/traffic-pool-api.ts
index 39f77dfa..6c1ce153 100644
--- a/SuperAdmin/lib/traffic-pool-api.ts
+++ b/SuperAdmin/lib/traffic-pool-api.ts
@@ -12,8 +12,8 @@ export interface Customer {
   region: string;
   tags: string[];
   source: string;
-  companyName: string;
-  createTime: string;
+  projectName: string;
+  addTime: string;
   mobile: number;
 }