Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -23,7 +23,7 @@ class MailController extends BaseController
         $lists = $mailModel->where('status',0)->where($this->map)
         $lists = $mailModel->where('status',0)->where($this->map)
             ->where('user_list','like','%,'.$this->uid.',%')
             ->where('user_list','like','%,'.$this->uid.',%')
             ->orWhere('user_list', '')
             ->orWhere('user_list', '')
-            ->select(['*'])->orderBy($this->order,'desc')
+            ->orderBy($this->order,'desc')
             ->paginate($this->row, ['*'], 'page', $this->page);
             ->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();

@@ -38,7 +38,7 @@ class Base extends Model
     {
     {
         $query = $this->formatQuery($map);
         $query = $this->formatQuery($map);
         $query = $this->sortOrder($query,$order,$sort);
         $query = $this->sortOrder($query,$order,$sort);
-        $lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
+        $lists = $query->select($fields)->paginate($row, $fields, 'page', $page);
         if (empty($lists)) {
         if (empty($lists)) {
             return [];
             return [];
         }
         }

@@ -62,8 +62,10 @@ class SyncService
             ];
             ];
             list($code, $result) = $this->curlRequest($url, $data);
             list($code, $result) = $this->curlRequest($url, $data);
             Log::info('同步收件信息至表单系统： 项目ID：' . $project_id . ', data: ' . var_export($data, true) . ', result: ' . $result);
             Log::info('同步收件信息至表单系统： 项目ID：' . $project_id . ', data: ' . var_export($data, true) . ', result: ' . $result);
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($result, true) . PHP_EOL, FILE_APPEND);
             return true;
             return true;
         } catch (\Exception $e) {
         } catch (\Exception $e) {
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($e->getMessage(), true) . PHP_EOL, FILE_APPEND);
             Log::info('同步收件信息至表单系统： 项目ID：' . $project_id . ', error: ' . $e->getMessage());
             Log::info('同步收件信息至表单系统： 项目ID：' . $project_id . ', error: ' . $e->getMessage());
             return false;
             return false;
         }
         }