Merge remote-tracking branch 'origin/master'

@@ -113,6 +113,7 @@ class Job extends Base {
         $limit = app()->request('limit', 20, 'intval');
         $limit = app()->request('limit', 20, 'intval');
         $jobId = app()->request('id', 0, 'intval');
         $jobId = app()->request('id', 0, 'intval');
         $status = app()->request('status');
         $status = app()->request('status');
+        $isExport = false;
 
 
         if (!$jobId) {
         if (!$jobId) {
             app()->e('send_job_id_null_error');
             app()->e('send_job_id_null_error');
@@ -120,12 +121,15 @@ class Job extends Base {
         $whereArray   = [
         $whereArray   = [
             'job_id' => $jobId
             'job_id' => $jobId
         ];
         ];
-        if ($status || $status === 0) {
+        if ($status || $status === '0') {
             $whereArray['status'] = $status;
             $whereArray['status'] = $status;
         }
         }
+        if (app()->request('is_export', 0)) {
+            $isExport = true;
+        }
         $where = dbWhere($whereArray);
         $where = dbWhere($whereArray);
 
 
-        $lists = db()->all(sendJobStatusSql::detail($where, $page, $limit));
+        $lists = db()->all(sendJobStatusSql::detail($where, $page, $limit, $isExport));
 
 
         return listsPage($lists,
         return listsPage($lists,
             db()->count(sendJobStatusSql::detailCount($where))
             db()->count(sendJobStatusSql::detailCount($where))

@@ -48,10 +48,14 @@ class sendJobStatusSql {
      * @param $where
      * @param $where
      * @param int $page
      * @param int $page
      * @param int $limit
      * @param int $limit
+     * @param bool $isExport
      * @return string
      * @return string
      */
      */
-    public static function detail($where, int $page = 1, int $limit = 20)
+    public static function detail($where, int $page = 1, int $limit = 20, bool $isExport = false)
     {
     {
+        if ($isExport) {
+            return "select * from `" . static::$table . "` where " . $where . " order by id desc";
+        }
         return "select * from `" . static::$table . "` where " . $where . " order by id desc limit {$limit} offset " . (($page - 1) * $limit);
         return "select * from `" . static::$table . "` where " . $where . " order by id desc limit {$limit} offset " . (($page - 1) * $limit);
     }
     }