|
...
|
...
|
@@ -338,8 +338,8 @@ class ComController extends BaseController |
|
|
|
$this->map['start_time'] = ['<=',date('Y-m-d H:i:s')];
|
|
|
|
$this->map['end_time'] = ['>=',date('Y-m-d H:i:s')];
|
|
|
|
$this->map['status'] = 0;
|
|
|
|
$lists = $oaNoticeModel->formatQuery($this->map)->where('project_str','like','%,'.$this->user['project_id'].',%')
|
|
|
|
->select(['*'])->orderBy($this->order,'desc')->paginate($this->row, ['*'], 'page', $this->page);
|
|
|
|
$this->map['project_str'] = ['like','%,'.$this->user['project_id'].',%'];
|
|
|
|
$lists = $oaNoticeModel->formatQuery($this->map)->orWhere('project_str', 'all')->select(['*'])->orderBy($this->order,'desc')->paginate($this->row, ['*'], 'page', $this->page);
|
|
|
|
$this->response('success',Code::SUCCESS,$lists);
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|