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

@@ -22,7 +22,7 @@ class MailController extends BaseController
         //获取当前用户下的所有站内信
         //获取当前用户下的所有站内信
         $lists = $mailModel->where('status',0)
         $lists = $mailModel->where('status',0)
             ->where('user_list','like','%,'.$this->uid.',%')->orWhere('user_list', '')->select(['*'])->orderBy($this->order,'desc')
             ->where('user_list','like','%,'.$this->uid.',%')->orWhere('user_list', '')->select(['*'])->orderBy($this->order,'desc')
-            ->get();
+            ->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
         }
         }

@@ -133,9 +133,11 @@ class CountLogic extends BaseLogic
             ->select('referrer_url', DB::raw('COUNT(*) as count'))->groupBy('referrer_url')
             ->select('referrer_url', DB::raw('COUNT(*) as count'))->groupBy('referrer_url')
             ->orderByDesc('count')->limit(8)->get()->toArray();
             ->orderByDesc('count')->limit(8)->get()->toArray();
         $total = DB::table('gl_customer_visit')->count();
         $total = DB::table('gl_customer_visit')->count();
-        $data = object_to_array($data);
-        foreach ($data as $k=>$v){
-            $data[$k]['proportion'] = ($v['count']/$total) * 100;
+        if(!empty($data)){
+            $data = object_to_array($data);
+            foreach ($data as $k=>$v){
+                $data[$k]['proportion'] = ($v['count']/$total) * 100;
+            }
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }
@@ -150,10 +152,12 @@ class CountLogic extends BaseLogic
         $data = DB::table('gl_customer_visit')
         $data = DB::table('gl_customer_visit')
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
             ->groupBy('country')->orderBy('ip','desc')->limit(20)->get()->toArray();
             ->groupBy('country')->orderBy('ip','desc')->limit(20)->get()->toArray();
-        $data = object_to_array($data);
-        foreach ($data as $k => $v){
-            $v['pv'] = (int)$v['pv'];
-            $data[$k] = $v;
+        if(!empty($data)){
+            $data = object_to_array($data);
+            foreach ($data as $k => $v){
+                $v['pv'] = (int)$v['pv'];
+                $data[$k] = $v;
+            }
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -186,8 +186,10 @@ class Project extends Base
     public function getNoticeFileAttribute($value)
     public function getNoticeFileAttribute($value)
     {
     {
         $value = Arr::s2a($value);
         $value = Arr::s2a($value);
-        foreach ($value as &$v) {
-            $v = Upload::path2url($v);
+        if(!empty($value)){
+            foreach ($value as &$v) {
+                $v = Upload::path2url($v);
+            }
         }
         }
         return $value;
         return $value;
     }
     }
@@ -203,8 +205,10 @@ class Project extends Base
     public function getConfirmFileAttribute($value)
     public function getConfirmFileAttribute($value)
     {
     {
         $value = Arr::s2a($value);
         $value = Arr::s2a($value);
-        foreach ($value as &$v) {
-            $v = Upload::path2url($v);
+        if(!empty($value)) {
+            foreach ($value as &$v) {
+                $v = Upload::path2url($v);
+            }
         }
         }
         return $value;
         return $value;
     }
     }