|
...
|
...
|
@@ -70,7 +70,7 @@ class AsideTicketController extends BaseController |
|
|
|
//TODO::用户部门搜索
|
|
|
|
if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
|
|
|
|
$manageHrModel = new ManageHr();
|
|
|
|
$manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id']],'manage_id');
|
|
|
|
$manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
|
|
|
|
$query->whereHas('logs', function ($q) use ($manageIdArr) {
|
|
|
|
$q->whereIn('engineer_id', $manageIdArr);
|
|
|
|
});
|
|
...
|
...
|
@@ -245,7 +245,7 @@ class AsideTicketController extends BaseController |
|
|
|
$ticket->status = $request->input('status');
|
|
|
|
if ($request->input('num'))
|
|
|
|
$ticket->num = $request->input('num',0);
|
|
|
|
|
|
|
|
|
|
|
|
if ($ticket->status == Tickets::STATUS_COMPLETED)
|
|
|
|
{
|
|
|
|
// 完成工单，把子任务里面未完成的工单改为完成
|
...
|
...
|
|
