Merge branch 'hotfix/stockn' into develop

2026-01-22 17:23:16 +08:00
parent 278dda4f7a 67a39917f0
commit 80d0196c3d
1 changed files with 2 additions and 0 deletions
@@ -60,10 +60,12 @@ class StockOrdersService extends \app\common\service\StockOrdersService
                                ->pluck('user_id')
                                ->toArray();
                            $config['where']['salesperson_id'] = ['in',$report];
+                            $config['where']['approval_status'] = ['>=',1];
                        }else{ //内勤没有负责的组时
                            $config['where']['salesperson_id'] = $request->user->uid;
                        }
                    } elseif (in_array(1,$roles_id)) { //超管可以看所有的
+                        $config['where']['approval_status'] = ['>=',1];
                        unset($config['where']['salesperson_id']);
                    }else{
                        $config['where']['salesperson_id'] = $request->user->uid;