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

@@ -156,18 +156,16 @@ class BaseController extends Controller
                     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':
-
-                        $data['operator_name'] = $name ? $name : '';
+                        if(!empty($v)){
+                            $name = $this->get_name(['operator_id'=>$v]);
+                            $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
+                        }
                         break;
                         break;
-
                 }
                 }
             }
             }
         }
         }
@@ -181,7 +179,7 @@ class BaseController extends Controller
      */
      */
     public function get_name($data){
     public function get_name($data){
         $user = new UserModel();
         $user = new UserModel();
-        $info = $user->read($data,['name']);
+        $info = $user->read($data,['id','name']);
         return $info;
         return $info;
     }
     }
     /**
     /**