作者 lyh

gx

... ... @@ -162,10 +162,10 @@ class OptimizeController extends BaseController
if(isset($this->map['optimize_assist_mid']) && !empty($this->map['optimize_assist_mid'])){
$query = $query->where('gl_project_deploy_optimize.assist_mid','like','%'.$this->map['optimize_assist_mid'].'%');
}
if(isset($this->map['user_id']) && !empty($this->map['user_id'])){
if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
$query->where(function ($subQuery) {
$subQuery->orWhere('gl_project.channel','like','%"user_id": "'.$this->map['user_id'].'"%')
->orWhere('gl_project.channel','like','%"user_id": '.$this->map['user_id'].'%');
$subQuery->orWhere('gl_project.channel','like','%"zone_id": "'.$this->map['channel_id'].'"%')
->orWhere('gl_project.channel','like','%"zone_id": '.$this->map['channel_id'].'%');
});
}
if(isset($this->map['domain']) && !empty($this->map['domain'])){
... ...
... ... @@ -592,7 +592,7 @@ class BTemplateLogic extends BaseLogic
$bTemplateMainModel = new BTemplateMain();
$mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
if($mainInfo === false){
$main_html = "<main>{$this->getModule($this->param['type'])}</main>";
$main_html = $this->getModule($this->param['type']);
$main_style = "<style id='globalsojs-styles'></style>";
}else{
$main_html = $mainInfo['main_html'];
... ...