diff --git a/app/common/controller/VehVehicleSkuController.php b/app/common/controller/VehVehicleSkuController.php index a3661da..9c41686 100644 --- a/app/common/controller/VehVehicleSkuController.php +++ b/app/common/controller/VehVehicleSkuController.php @@ -47,6 +47,7 @@ class VehVehicleSkuController extends BaseController public function store(Request $request) { + return $this->error('请优先抓取车辆信息,如抓取不到相应车型请联系管理员,暂停手动录入车辆信息'); try { $data = $this->validate($this->service->getValidator(), $request->post(), 'store'); $res = $this->service->serviceStore($request, $data); diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 6ea31bd..bb8ae75 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -159,14 +159,10 @@ class UserService /** 分页列表 */ public function serviceTeam(Request $request) { - if (method_exists($this, 'complexQuery')) { - $result = $this->complexQuery($request->get()); - } else { - $config = $this->buildQueryConfig($request, 'team'); - $limit = (int)$request->get('size', 15); - $page = (int)$request->get('current', 1); - $result = $this->logicList($config, $limit, $page); - } + $config = $this->buildQueryConfig($request, 'team'); + $limit = (int)$request->get('size', 15); + $page = (int)$request->get('current', 1); + $result = $this->logicList($config, $limit, $page); foreach ($result as &$data){ $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); @@ -219,9 +215,14 @@ class UserService $config['where']['status'] = $p['status']; } - $config['dataLimit']['type'] = 'relation'; - $config['dataLimit']['userId'] = $request->user->uid; - $config['dataLimit']['userField'] = 'report_to'; + $config['with']= ['reportToInfo']; + if (!in_array(1, $request->user->role_ids)) { + $config['where']['reportToInfo.id'] = $request->user->uid; + } + + // $config['dataLimit']['type'] = 'relation'; + // $config['dataLimit']['userId'] = $request->user->uid; + // $config['dataLimit']['userField'] = 'report_to'; break; }