作者 ZhengBing He

ok

@@ -225,23 +225,25 @@ class AsideTicketController extends BaseController @@ -225,23 +225,25 @@ class AsideTicketController extends BaseController
225 */ 225 */
226 public function pushNotify($id) 226 public function pushNotify($id)
227 { 227 {
228 - $ticket = Tickets::find($id);  
229 - if (!$ticket) {  
230 - $this->response('工单不存在', Code::USER_MODEL_NOTFOUND_ERROE);  
231 - } 228 + $project = TicketProject::find($id);
  229 + if (empty($project))
  230 + $this->response('工单项目不存在', Code::USER_MODEL_NOTFOUND_ERROE);
232 231
233 - $project = $ticket->project;  
234 if (empty($project->association)) { 232 if (empty($project->association)) {
235 $this->response('该工单没有绑定的企微群', Code::USER_MODEL_NOTFOUND_ERROE); 233 $this->response('该工单没有绑定的企微群', Code::USER_MODEL_NOTFOUND_ERROE);
236 } 234 }
237 235
  236 + $ticket = Tickets::where('project_id', $project->id)
  237 + ->orderBy('id', 'desc')
  238 + ->first();
  239 +
238 $message_push = new MessagePush(); 240 $message_push = new MessagePush();
239 $message_push->project_id = $project->table_id; 241 $message_push->project_id = $project->table_id;
240 $message_push->friend_id = $project->association->friend_id; 242 $message_push->friend_id = $project->association->friend_id;
241 $message_push->content_type = 'Link'; 243 $message_push->content_type = 'Link';
242 $message_push->content = json_encode([ 244 $message_push->content = json_encode([
243 'title' => '工单查看 - ' . $project->company_name, 245 'title' => '工单查看 - ' . $project->company_name,
244 - 'desc' => $ticket->title, 246 + 'desc' => $ticket ? $ticket->title : "工单列表",
245 'size' => 0, 247 'size' => 0,
246 'thumbSize' => 0, 248 'thumbSize' => 0,
247 'thumbUrl' => 'https://oa.quanqiusou.cn/logo.ico', 249 'thumbUrl' => 'https://oa.quanqiusou.cn/logo.ico',
@@ -254,7 +254,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -254,7 +254,7 @@ Route::middleware(['aloginauth'])->group(function () {
254 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单'); 254 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
255 Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情'); 255 Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
256 Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核,邀请同事'); 256 Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核,邀请同事');
257 - Route::get('/pushNotify/{ticket_id}', [Aside\WorkOrder\AsideTicketController::class, 'pushNotify'])->name('admin.tickets.pushNotify')->summary('A端工单推送企微群'); 257 + Route::get('/pushNotify/{id}', [Aside\WorkOrder\AsideTicketController::class, 'pushNotify'])->name('admin.tickets.pushNotify')->summary('A端工单推送企微群');
258 Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表'); 258 Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
259 Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表'); 259 Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表');
260 Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单'); 260 Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');