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

Lyh server



查看合并请求 !2702

@@ -109,15 +109,31 @@ class AsideTicketController extends BaseController
         //TODO::用户部门搜索
         //TODO::用户部门搜索
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
             $manageHrModel = new ManageHr();
             $manageHrModel = new ManageHr();
+            //售后优化+技术搜索
+            if($this->param['dept_id'] == 2 && !empty($this->param['entry_position'])) {//售后部
+                if ($this->param['entry_position'] == 1) {
+                    $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [44, 46, 49]], 'status' => 1], 'manage_id');
+                } else {
+                    //售后技术
+                    $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
+                }
+                $query->whereHas('logs', function ($q) use ($manageIdArr) {
+                    $q->whereIn('engineer_id', $manageIdArr);
+                });
+            }else{
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
                 $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
                 $query->whereHas('logs', function ($q) use ($manageIdArr) {
                 $query->whereHas('logs', function ($q) use ($manageIdArr) {
                     $q->whereIn('engineer_id', $manageIdArr);
                     $q->whereIn('engineer_id', $manageIdArr);
                 });
                 });
             }
             }
+        }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
         }
         }
-
+        //搜索提交人姓名
+        if(!empty($this->param['submit_username'])){
+            return $query->where('submit_username','%'.$this->param['submit_username'].'%');
+        }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');
 //        $query->orderBy('id', 'desc');
 //        $query->orderBy('id', 'desc');