正在显示
1 个修改的文件
包含
3 行增加
和
3 行删除
| @@ -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 | } |
-
请 注册 或 登录 后发表评论