合并分支 'lyh-server' 到 'master'
更新询盘数据 查看合并请求 !2581
正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
| @@ -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 | }); |
-
请 注册 或 登录 后发表评论