From f34975478b55d05384977e2dcda9377e67a26454 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 17 Mar 2020 09:42:21 +0800 Subject: [PATCH] upt --- Application/Admin/Controller/ExportController.class.php | 4 ++++ .../Admin/Controller/StatisticsController.class.php | 4 ++++ Application/Admin/View/Statistics/packuserdownload.html | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index bdf138d3e..962049ad0 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8556,6 +8556,10 @@ class ExportController extends Controller if (I('user_account')) { $map['u.account'] = I('user_account'); + } + + if (I('type')) { + $map['pdl.type'] = I('type'); } if ($startTime = I('create_time_start')) { diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index 0067d5ca9..9ee7ba26f 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -1238,6 +1238,10 @@ class StatisticsController extends ThinkController { if (I('user_account')) { $map['u.account'] = I('user_account'); } + + if (I('type')) { + $map['pdl.type'] = I('type'); + } if ($startTime = I('create_time_start')) { $startTime = strtotime($startTime); diff --git a/Application/Admin/View/Statistics/packuserdownload.html b/Application/Admin/View/Statistics/packuserdownload.html index 18004bded..ad08729b2 100644 --- a/Application/Admin/View/Statistics/packuserdownload.html +++ b/Application/Admin/View/Statistics/packuserdownload.html @@ -75,6 +75,14 @@