Merge remote-tracking branch 'origin/master' into akun

@@ -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'])){

@@ -56,7 +56,7 @@ class OperationHeartbeatController extends BaseController
             $condition['manager_id'] = $this->user['manager_id'] ?? 0;
             $condition['manager_id'] = $this->user['manager_id'] ?? 0;
             $operationHeartbeatModel->addReturnId($condition);
             $operationHeartbeatModel->addReturnId($condition);
         }else{
         }else{
-            $operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0,'ip'=>$this->request->ip(),'manager_id'=> $this->user['manager_id'] ?? 0],['id'=>$info['id']]);
+            $operationHeartbeatModel->edit(['status'=>$condition['status'] ?? 0,'operator_id'=>$this->user['id'],'ip'=>$this->request->ip(),'manager_id'=> $this->user['manager_id'] ?? 0],['id'=>$info['id']]);
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
@@ -114,7 +114,7 @@ class OperationHeartbeatController extends BaseController
                         //账号密码登录
                         //账号密码登录
                         $userModel = new User();
                         $userModel = new User();
                         $userInfo = $userModel->read(['id'=>$info['operator_id']],['name']);
                         $userInfo = $userModel->read(['id'=>$info['operator_id']],['name']);
-                        $info['message'] = '此页面数据已有人在编辑，请勿重复操作！'.$userInfo['name'].'用户登录在操作。';
+                        $info['message'] = '此页面数据已有人在编辑，请勿重复操作！'.($userInfo['name'] ?? '').'用户登录在操作。';
                     }
                     }
                 }else{
                 }else{
                     $info['message'] = '此页面数据已有人在编辑，请勿重复操作！';
                     $info['message'] = '此页面数据已有人在编辑，请勿重复操作！';