|
...
|
...
|
@@ -53,7 +53,9 @@ class ProjectController extends BaseController |
|
|
|
$query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
|
|
|
|
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
|
|
|
|
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
|
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
|
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
|
|
|
|
->where('gl_project.delete_status',Project::TYPE_ZERO)
|
|
|
|
->where('gl_project.extend_type',Project::TYPE_ZERO);
|
|
|
|
$query = $this->searchParam($query);
|
|
|
|
$lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
|
|
|
if(!empty($lists) && !empty($lists['list'])){
|
|
...
|
...
|
@@ -94,11 +96,6 @@ class ProjectController extends BaseController |
|
|
|
* @time :2023/8/30 10:14
|
|
|
|
*/
|
|
|
|
public function searchType(&$query){
|
|
|
|
$query->where('gl_project.delete_status',Project::TYPE_ZERO);
|
|
|
|
$query->where('gl_project.extend_type',Project::TYPE_ZERO);
|
|
|
|
if(!isset($this->map['type'])){
|
|
|
|
$this->map['type'] = Project::TYPE_ZERO;
|
|
|
|
}
|
|
|
|
if($this->map['type'] == Project::TYPE_ZERO){
|
|
|
|
$query->where('gl_project.type',Project::TYPE_ZERO);
|
|
|
|
}elseif ($this->map['type'] == Project::TYPE_ONE){
|
...
|
...
|
|
