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

变更数据



查看合并请求 !3353

@@ -40,6 +40,7 @@ class TicketController extends BaseController
             'logs.engineer',
             'logs.engineer',
         ])
         ])
             ->where('project_id', $project->id)
             ->where('project_id', $project->id)
+            ->where('title','!=','研发工单(客户不可见)')
 //            ->where('submit_side', 2)
 //            ->where('submit_side', 2)
             ->when($request->input('status') !== null, function ($query) use ($request) {
             ->when($request->input('status') !== null, function ($query) use ($request) {
                 // status 查 gl_tickets.status
                 // status 查 gl_tickets.status

@@ -215,8 +215,11 @@ class AsideTicketController extends BaseController
                     return $query->where('id', 0); // 返回空结果
                     return $query->where('id', 0); // 返回空结果
                 }
                 }
             })
             })
+            ->when(isset($this->param['engineer_id']) && !empty($this->param['engineer_id']), function ($query) {
+                return $query->where('engineer_id', $this->param['engineer_id']);
+            })
             //待审核项目列表
             //待审核项目列表
-            ->when(!empty($this->param['pending_review']), function ($query) use ($validated) {
+            ->when(!empty($this->param['pending_review']), function ($query) {
                 // 查找项目名称或公司名称
                 // 查找项目名称或公司名称
                 $ticketUploadModel = new TicketUploadData();
                 $ticketUploadModel = new TicketUploadData();
                 if(!isset($this->param['project_type']) || empty($this->param['project_type'])){
                 if(!isset($this->param['project_type']) || empty($this->param['project_type'])){