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

@@ -323,9 +323,9 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
-        $query->where(function ($subQuery) {
-            $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
-        });
+//        $query->where(function ($subQuery) {
+//            $subQuery->where('gl_project.is_upgrade',1);
+//        });
         return $query;
     }
 

@@ -129,8 +129,8 @@ class TicketLogic extends BaseLogic
         $manageWeekModel = new TicketWeekManageCount();
         $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
         $deptWeekModel = new TicketWeekDeptCount();
-        $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
-        return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);
+        $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
+        return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList ?? []]);
     }
 
     /**
@@ -148,7 +148,7 @@ class TicketLogic extends BaseLogic
         $manageWeekModel = new TicketMonthManageCount();
         $manageWeekList = $manageWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
         $deptWeekModel = new TicketMonthDeptCount();
-        $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end,'dept_id'=>$dept_id]);
+        $deptWeekList = $deptWeekModel->list(['start_at'=>$start,'end_at'=>$end]);
         return $this->success(['manage'=>$manageWeekList,'dept'=>$deptWeekList]);
     }
 }