xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-11-13 11:50:32 +08:00
parent c157b3ee12 76bd46a0d7
commit 1d9fbb9032
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/VehVehicleSkuController.php
+1
View File
@@ -47,6 +47,7 @@ class VehVehicleSkuController extends BaseController
public function store(Request $request) public function store(Request $request)
{ {
return $this->error('请优先抓取车辆信息，如抓取不到相应车型请联系管理员，暂停手动录入车辆信息');
try { try {
$data = $this->validate($this->service->getValidator(), $request->post(), 'store'); $data = $this->validate($this->service->getValidator(), $request->post(), 'store');
$res = $this->service->serviceStore($request, $data); $res = $this->service->serviceStore($request, $data);
app/common/service/UserService.php
+12 -11
View File
@@ -159,14 +159,10 @@ class UserService
/** 分页列表 */ /** 分页列表 */
public function serviceTeam(Request $request) public function serviceTeam(Request $request)
{ {
if (method_exists($this, 'complexQuery')) { $config = $this->buildQueryConfig($request, 'team');
$result = $this->complexQuery($request->get()); $limit = (int)$request->get('size', 15);
} else { $page = (int)$request->get('current', 1);
$config = $this->buildQueryConfig($request, 'team'); $result = $this->logicList($config, $limit, $page);
$limit = (int)$request->get('size', 15);
$page = (int)$request->get('current', 1);
$result = $this->logicList($config, $limit, $page);
}
foreach ($result as &$data){ foreach ($result as &$data){
$data['customer_count'] = Customer::where('user_id', $data['id'])->count(); $data['customer_count'] = Customer::where('user_id', $data['id'])->count();
@@ -219,9 +215,14 @@ class UserService
$config['where']['status'] = $p['status']; $config['where']['status'] = $p['status'];
} }
$config['dataLimit']['type'] = 'relation'; $config['with']= ['reportToInfo'];
$config['dataLimit']['userId'] = $request->user->uid; if (!in_array(1, $request->user->role_ids)) {
$config['dataLimit']['userField'] = 'report_to'; $config['where']['reportToInfo.id'] = $request->user->uid;
}
// $config['dataLimit']['type'] = 'relation';
// $config['dataLimit']['userId'] = $request->user->uid;
// $config['dataLimit']['userField'] = 'report_to';
break; break;
} }