合并分支 'lyh-server' 到 'master'
变更数据 查看合并请求 !3139
正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
| @@ -290,7 +290,7 @@ class OptimizeController extends BaseController | @@ -290,7 +290,7 @@ class OptimizeController extends BaseController | ||
| 290 | $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]); | 290 | $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]); |
| 291 | } | 291 | } |
| 292 | if(isset($this->map['online_updated_at']) && !empty($this->map['online_updated_at']) && is_array($this->map['online_updated_at'])){ | 292 | if(isset($this->map['online_updated_at']) && !empty($this->map['online_updated_at']) && is_array($this->map['online_updated_at'])){ |
| 293 | - $query = $query->where('gl_project_deploy_optimize.start_date','>=' ,$this->map['online_updated_at'][0])->where('gl_project_deploy_optimize.start_date','<' ,$this->map['online_updated_at'][1]); | 293 | + $query = $query->where('gl_project_deploy_optimize.start_date','>=' ,$this->map['online_updated_at'][0])->where('gl_project_deploy_optimize.start_date','<=' ,$this->map['online_updated_at'][1]); |
| 294 | } | 294 | } |
| 295 | if(isset($this->map['special'])){ | 295 | if(isset($this->map['special'])){ |
| 296 | $query = $query->whereRaw("FIND_IN_SET(?, gl_project_deploy_optimize.special) > 0", [$this->map['special']]); | 296 | $query = $query->whereRaw("FIND_IN_SET(?, gl_project_deploy_optimize.special) > 0", [$this->map['special']]); |
-
请 注册 或 登录 后发表评论