Merge branch 'develop' into feature/mzl_dev

2025-09-10 13:39:06 +08:00
parent 7a8c0d6cc3
commit 17efdf01df
10 changed files with 760 additions and 765 deletions
@@ -11,7 +11,6 @@ use app\common\model\StockOrders;
 use app\common\model\SysCurrency;
 use support\Request;
 use app\common\model\User;
-use support\exception\BusinessException;
 use support\Db;

 class StockOrdersService
@@ -63,6 +62,10 @@ class StockOrdersService
                }

                $config['order']['id'] = 'desc';
+
+                // $config['dataLimit']['type'] = 'relation';
+                // $config['dataLimit']['userId'] = $request->user->uid;
+                // $config['dataLimit']['userField'] = 'salesperson_id';
                break;
            case 'print':
                $config['where']['id'] = $p['id'];