合并分支 'akun' 到 'master'

Akun



查看合并请求 !716

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Models\AutoPull\AutoPullNotify;
 use App\Models\AutoPull\AutoPullNotify;
+use App\Models\Manage\Manage;
 
 
 class AutoPullController extends BaseController
 class AutoPullController extends BaseController
 {
 {
@@ -19,7 +20,9 @@ class AutoPullController extends BaseController
         $autoModule = new AutoPullNotify();
         $autoModule = new AutoPullNotify();
         $lists = $autoModule->lists($this->map, $this->page, $this->row);
         $lists = $autoModule->lists($this->map, $this->page, $this->row);
         if (!empty($lists)) {
         if (!empty($lists)) {
+            $manage_model = new Manage();
             foreach ($lists['list'] as $k => $v) {
             foreach ($lists['list'] as $k => $v) {
+                $lists['list'][$k]['operator_name'] = $manage_model->getName($v['user_id']);
                 $lists['list'][$k]['server_name'] = AutoPullNotify::serversMap()[$v['server_id']];
                 $lists['list'][$k]['server_name'] = AutoPullNotify::serversMap()[$v['server_id']];
 
 
                 $process = Arr::s2a($v['process']);
                 $process = Arr::s2a($v['process']);