From f1428a8fe7fe9690de9a39c37e66ce633a1de5a9 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 13 Apr 2020 14:40:32 +0800
Subject: [PATCH] upt

---
 Application/Admin/Controller/ExportController.class.php    | 5 ++---
 Application/Admin/Controller/WorkOrderController.class.php | 4 ++--
 Application/Admin/View/WorkOrder/statistics.html           | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index f5b74074c..7171ab0ad 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -9219,7 +9219,7 @@ class ExportController extends Controller
                         count(*) AS total_create_count,
                         count(
             
-                            IF (i.`handler_id` = 0, 1, NULL)
+                            IF (i.`handler_id` > 0, 1, NULL)
                         ) AS total_accepted_count,
                         NULL AS total_handle_count,
                         NULL AS total_complete_count
@@ -9239,7 +9239,7 @@ class ExportController extends Controller
                             count(IF(i.`status` = 1, 1, NULL)) AS total_complete_count
                         FROM
                             sys_member u
-                        LEFT JOIN tab_work_order_info i ON i.handler_id = u.uid
+                        JOIN tab_work_order_info i ON i.handler_id = u.uid
                         WHERE
                             u.uid in ({$userids})
                         GROUP BY u.uid
@@ -9248,7 +9248,6 @@ class ExportController extends Controller
             GROUP BY t.id
             $order");
         }
-
         $xlsName = '工单统计报表';
         $xlsCell = array(
             array('nickname', "账号"),
diff --git a/Application/Admin/Controller/WorkOrderController.class.php b/Application/Admin/Controller/WorkOrderController.class.php
index 4377992aa..235768914 100644
--- a/Application/Admin/Controller/WorkOrderController.class.php
+++ b/Application/Admin/Controller/WorkOrderController.class.php
@@ -397,7 +397,7 @@ class WorkOrderController extends ThinkController
                         count(*) AS total_create_count,
                         count(
             
-                            IF (i.`handler_id` = 0, 1, NULL)
+                            IF (i.`handler_id` > 0, 1, NULL)
                         ) AS total_accepted_count,
                         NULL AS total_handle_count,
                         NULL AS total_complete_count
@@ -417,7 +417,7 @@ class WorkOrderController extends ThinkController
                             count(IF(i.`status` = 1, 1, NULL)) AS total_complete_count
                         FROM
                             sys_member u
-                        LEFT JOIN tab_work_order_info i ON i.handler_id = u.uid
+                        JOIN tab_work_order_info i ON i.handler_id = u.uid
                         WHERE
                             u.uid in ({$userids})
                         GROUP BY u.uid
diff --git a/Application/Admin/View/WorkOrder/statistics.html b/Application/Admin/View/WorkOrder/statistics.html
index 097b34ebd..6cf807c5d 100644
--- a/Application/Admin/View/WorkOrder/statistics.html
+++ b/Application/Admin/View/WorkOrder/statistics.html
@@ -120,8 +120,8 @@
                             <td>{$data.nickname}</td>
                             <td>{$data.total_create_count}</td>
                             <td>{$data.total_accepted_count}</td>
-                            <td>{$data.total_handle_count}</td>
-                            <td>{$data.total_complete_count}</td>
+                            <td>{$data.total_handle_count | default=0}</td>
+                            <td>{$data.total_complete_count | default=0}</td>
                         </tr>
                     </volist>
                 </empty>