合并分支 'workorder' 到 'master'

ok



查看合并请求 !2366

@@ -175,7 +175,8 @@ class AsideTicketController extends BaseController
 
 
             // 分配工单参与人
             // 分配工单参与人
             $ticket->saveEngineers($request->input('engineer_ids', []));
             $ticket->saveEngineers($request->input('engineer_ids', []));
-            $project->pushWechatGroupMsg("创贸（{$ticket->submit_username}）新增了工单（ID：{$ticket->id}），请及时处理！");
+            $nickname = ManageHr::where('manage_id', $this->manage['id'])->value('nickname') ?? mb_substr($ticket->submit_username, 0, 1) . '**';
+            $project->pushWechatGroupMsg("创贸（{$nickname}）新增了工单（ID：{$ticket->id}），请及时处理！");
             return $ticket;
             return $ticket;
         });
         });
         $this->response('success', Code::SUCCESS, $result->toArray());
         $this->response('success', Code::SUCCESS, $result->toArray());

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside\WorkOrder;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Requests\Api\WorkOrder\TicketChatStoreRequest;
 use App\Http\Requests\Api\WorkOrder\TicketChatStoreRequest;
+use App\Models\Manage\ManageHr;
 use App\Models\WorkOrder\TicketChat;
 use App\Models\WorkOrder\TicketChat;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -64,7 +65,8 @@ class TicketChatController extends BaseController
         $chat->manage_id = $this->manage['id'];
         $chat->manage_id = $this->manage['id'];
         $chat->save();
         $chat->save();
         $project = $ticket->project;
         $project = $ticket->project;
-        $project->pushWechatGroupMsg("{$chat->submit_username}对工单（ID：{$ticket->id}）进行了补充，请及时查看处理！");
+        $nickname = ManageHr::where('manage_id', $this->manage['id'])->value('nickname') ?? mb_substr($ticket->submit_username, 0, 1) . '**';
+        $project->pushWechatGroupMsg("创贸（{$nickname}）对工单（ID：{$ticket->id}）进行了补充，请及时查看处理！");
         $this->response('success', Code::SUCCESS, $chat);
         $this->response('success', Code::SUCCESS, $chat);
     }
     }