gx

@@ -66,10 +66,13 @@ class WebSettingLogic extends BaseLogic
      */
      */
     public function sendNotifyMessage($type,$page){
     public function sendNotifyMessage($type,$page){
         $updateProgressModel = new UpdateProgress();
         $updateProgressModel = new UpdateProgress();
-        $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$type])->orderBy('id','desc')->first()->toArray();
-        if((!empty($progressInfo)) && ($progressInfo['total_num'] > $progressInfo['current_num'])){
+        $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$type])->orderBy('id','desc')->first();
+        if((!empty($progressInfo))){
+            $progressInfo = $progressInfo->toArray();
+            if(($progressInfo['total_num'] > $progressInfo['current_num'])){
                 return $this->success($progressInfo);
                 return $this->success($progressInfo);
             }
             }
+        }
         $updateNotifyModel = new UpdateNotify();
         $updateNotifyModel = new UpdateNotify();
         $field = ($type == UpdateNotify::TYPE_MINOR) ? 'minor_languages_status' : 'status';
         $field = ($type == UpdateNotify::TYPE_MINOR) ? 'minor_languages_status' : 'status';
         $count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], $field => 0])->count();
         $count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], $field => 0])->count();