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() { {customer.region} {customer.source} - {customer.companyName} - {customer.createTime} + {customer.projectName} + {customer.addTime} 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; }