正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -70,7 +70,7 @@ class AsideTicketController extends BaseController | @@ -70,7 +70,7 @@ class AsideTicketController extends BaseController | ||
| 70 | //TODO::用户部门搜索 | 70 | //TODO::用户部门搜索 |
| 71 | if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){ | 71 | if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){ |
| 72 | $manageHrModel = new ManageHr(); | 72 | $manageHrModel = new ManageHr(); |
| 73 | - $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id']],'manage_id'); | 73 | + $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id'); |
| 74 | $query->whereHas('logs', function ($q) use ($manageIdArr) { | 74 | $query->whereHas('logs', function ($q) use ($manageIdArr) { |
| 75 | $q->whereIn('engineer_id', $manageIdArr); | 75 | $q->whereIn('engineer_id', $manageIdArr); |
| 76 | }); | 76 | }); |
| @@ -245,7 +245,7 @@ class AsideTicketController extends BaseController | @@ -245,7 +245,7 @@ class AsideTicketController extends BaseController | ||
| 245 | $ticket->status = $request->input('status'); | 245 | $ticket->status = $request->input('status'); |
| 246 | if ($request->input('num')) | 246 | if ($request->input('num')) |
| 247 | $ticket->num = $request->input('num',0); | 247 | $ticket->num = $request->input('num',0); |
| 248 | - | 248 | + |
| 249 | if ($ticket->status == Tickets::STATUS_COMPLETED) | 249 | if ($ticket->status == Tickets::STATUS_COMPLETED) |
| 250 | { | 250 | { |
| 251 | // 完成工单,把子任务里面未完成的工单改为完成 | 251 | // 完成工单,把子任务里面未完成的工单改为完成 |
-
请 注册 或 登录 后发表评论