合并分支 'lyh-server' 到 'master'

未续费项目增加搜索



查看合并请求 !2738

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