|
@@ -140,9 +140,39 @@ class OptimizeController extends BaseController |
|
@@ -140,9 +140,39 @@ class OptimizeController extends BaseController |
|
140
|
*/
|
140
|
*/
|
|
141
|
public function searchParam(&$query){
|
141
|
public function searchParam(&$query){
|
|
142
|
//搜索条件处理
|
142
|
//搜索条件处理
|
|
143
|
- if(isset($this->map['title'])){
|
143
|
+ if(isset($this->map['title']) && !empty($this->map['title'])){
|
|
144
|
$query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
|
144
|
$query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
|
|
145
|
}
|
145
|
}
|
|
|
|
146
|
+ if(isset($this->map['special']) && !empty($this->map['special'])){
|
|
|
|
147
|
+ $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
|
|
|
|
148
|
+ }
|
|
|
|
149
|
+ if(isset($this->map['manager_mid']) && !empty($this->map['manager_mid'])){
|
|
|
|
150
|
+ $query = $query->where('gl_project_deploy_build.manager_mid','like','%'.$this->map['manager_mid'].'%');
|
|
|
|
151
|
+ }
|
|
|
|
152
|
+ if(isset($this->map['optimize_manager_mid']) && !empty($this->map['optimize_manager_mid'])){
|
|
|
|
153
|
+ $query = $query->where('gl_project_deploy_optimize.manager_mid','like','%'.$this->map['optimize_manager_mid'].'%');
|
|
|
|
154
|
+ }
|
|
|
|
155
|
+ if(isset($this->map['optimize_tech_mid']) && !empty($this->map['optimize_tech_mid'])){
|
|
|
|
156
|
+ $query = $query->where('gl_project_deploy_optimize.tech_mid','like','%'.$this->map['optimize_tech_mid'].'%');
|
|
|
|
157
|
+ }
|
|
|
|
158
|
+ if(isset($this->map['optimize_optimist_mid']) && !empty($this->map['optimize_optimist_mid'])){
|
|
|
|
159
|
+ $query = $query->where('gl_project_deploy_optimize.optimist_mid','like','%'.$this->map['optimize_optimist_mid'].'%');
|
|
|
|
160
|
+ }
|
|
|
|
161
|
+ if(isset($this->map['optimize_assist_mid']) && !empty($this->map['optimize_assist_mid'])){
|
|
|
|
162
|
+ $query = $query->where('gl_project_deploy_optimize.assist_mid','like','%'.$this->map['optimize_assist_mid'].'%');
|
|
|
|
163
|
+ }
|
|
|
|
164
|
+ if(isset($this->map['user_id']) && !empty($this->map['user_id'])){
|
|
|
|
165
|
+ $query->where(function ($subQuery) {
|
|
|
|
166
|
+ $subQuery->orWhere('gl_project.channel','like','%"user_id": "'.$this->map['user_id'].'"%')
|
|
|
|
167
|
+ ->orWhere('gl_project.channel','like','%"user_id": '.$this->map['user_id'].'%');
|
|
|
|
168
|
+ });
|
|
|
|
169
|
+ }
|
|
|
|
170
|
+ if(isset($this->map['domain']) && !empty($this->map['domain'])){
|
|
|
|
171
|
+ $query = $query->where('gl_project_deploy_optimize.domain','like','%'.$this->map['domain'].'%');
|
|
|
|
172
|
+ }
|
|
|
|
173
|
+ if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
|
|
|
|
174
|
+ $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
|
|
|
|
175
|
+ }
|
|
146
|
$query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
|
176
|
$query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
|
|
147
|
return $query;
|
177
|
return $query;
|
|
148
|
}
|
178
|
}
|
