周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 12df46d25284ce9f830c90ffa781eef713600001 2 个父辈 72f25f0f 112f6c03

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 2 个修改的文件 包含 6 行增加 和 6 行删除
@@ -323,9 +323,9 @@ class OptimizeController extends BaseController @@ -323,9 +323,9 @@ class OptimizeController extends BaseController
323 $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%'); 323 $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
324 } 324 }
325 $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2 325 $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
326 - $query->where(function ($subQuery) {  
327 - $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);  
328 - }); 326 +// $query->where(function ($subQuery) {
  327 +// $subQuery->where('gl_project.is_upgrade',1);
  328 +// });
329 return $query; 329 return $query;
330 } 330 }
331 331
@@ -129,8 +129,8 @@ class TicketLogic extends BaseLogic @@ -129,8 +129,8 @@ class TicketLogic extends BaseLogic
129 $manageWeekModel = new TicketWeekManageCount(); 129 $manageWeekModel = new TicketWeekManageCount();
130 $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]); 130 $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
131 $deptWeekModel = new TicketWeekDeptCount(); 131 $deptWeekModel = new TicketWeekDeptCount();
132 - $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);  
133 - return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]); 132 + $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
  133 + return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList ?? []]);
134 } 134 }
135 135
136 /** 136 /**
@@ -148,7 +148,7 @@ class TicketLogic extends BaseLogic @@ -148,7 +148,7 @@ class TicketLogic extends BaseLogic
148 $manageWeekModel = new TicketMonthManageCount(); 148 $manageWeekModel = new TicketMonthManageCount();
149 $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]); 149 $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
150 $deptWeekModel = new TicketMonthDeptCount(); 150 $deptWeekModel = new TicketMonthDeptCount();
151 - $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]); 151 + $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
152 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]); 152 return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);
153 } 153 }
154 } 154 }