|
...
|
...
|
@@ -59,7 +59,7 @@ class CNoticeController extends BaseController |
|
|
|
if((!empty($progressInfo))){
|
|
|
|
$progressInfo = $progressInfo->toArray();
|
|
|
|
if(($progressInfo['total_num'] > $progressInfo['current_num'])){
|
|
|
|
return $this->success($progressInfo);
|
|
|
|
return $progressInfo;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$updateNotifyModel = new UpdateNotify();
|
|
...
|
...
|
@@ -72,14 +72,13 @@ class CNoticeController extends BaseController |
|
|
|
$count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], $field => 0])->count();
|
|
|
|
}
|
|
|
|
if($count == 0){
|
|
|
|
return $this->success();
|
|
|
|
return [];
|
|
|
|
}
|
|
|
|
// $this->addProgress($count,$type);
|
|
|
|
$this->addProgress($count,$type);
|
|
|
|
$updateNotifyModel->edit([$field => 1], ['project_id' => $this->user['project_id'], $field => 0]);
|
|
|
|
$urlStr = $this->getString($type,$page);
|
|
|
|
$this->curlGet($urlStr);
|
|
|
|
return $this->success();
|
|
|
|
}
|
|
|
|
return [];
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :curl请求
|
...
|
...
|
|