Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
-use App\Models\User\User;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Exceptions\HttpResponseException;
@@ -155,21 +155,36 @@ class BaseController extends Controller
                     $data[$k] = '';
                     $data[$k] = '';
                     continue;
                     continue;
                 }
                 }
+                //获取操作人
+                if((string) $k == 'operator_id' && !empty($v)){
+                    $name = $this->get_name(['operator_id'=>$v])['name'];
+                }
                 switch ((string) $k) {
                 switch ((string) $k) {
                     case 'image':
                     case 'image':
                         $data['image_link'] = url('/b/image/' . $v);
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
                         break;
                     case 'operator_id':
                     case 'operator_id':
-                        if(!empty($v)){
-                            $data['operator_name'] = (new User())->get_name($v);
-                        }
+                        var_dump($name);
+                        die();
+                        $data['operator_name'] = isset($name) ? $name : '';
+                        break;
 
 
                 }
                 }
             }
             }
         }
         }
         return $data;
         return $data;
     }
     }
-
+    /**
+     * @name :获取操作人名称
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_name($data){
+        $user = new UserModel();
+        $info = $user->read($data,['name']);
+        return $info;
+    }
     /**
     /**
      * @name :写入操作日志
      * @name :写入操作日志
      * @return void
      * @return void

@@ -121,14 +121,4 @@ class User extends Base
         return true;
         return true;
     }
     }
 
 
-    /**
-     * @name :获取操作人名称
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function get_name($operator_id = ''){
-        $info = $this->read(['operator_id'=>$operator_id],['name']);
-        return $info['name'];
-    }
 }
 }