Merge branch 'hotfix/stockn' into develop

This commit is contained in:
2026-01-22 17:23:16 +08:00
+2
View File
@@ -60,10 +60,12 @@ class StockOrdersService extends \app\common\service\StockOrdersService
->pluck('user_id') ->pluck('user_id')
->toArray(); ->toArray();
$config['where']['salesperson_id'] = ['in',$report]; $config['where']['salesperson_id'] = ['in',$report];
$config['where']['approval_status'] = ['>=',1];
}else{ //内勤没有负责的组时 }else{ //内勤没有负责的组时
$config['where']['salesperson_id'] = $request->user->uid; $config['where']['salesperson_id'] = $request->user->uid;
} }
} elseif (in_array(1,$roles_id)) { //超管可以看所有的 } elseif (in_array(1,$roles_id)) { //超管可以看所有的
$config['where']['approval_status'] = ['>=',1];
unset($config['where']['salesperson_id']); unset($config['where']['salesperson_id']);
}else{ }else{
$config['where']['salesperson_id'] = $request->user->uid; $config['where']['salesperson_id'] = $request->user->uid;