Merge branch 'feature/stock_next' into develop

# Conflicts: # app/admin/controller/SysDictController.php # app/admin/controller/VehColorController.php # app/admin/service/SysDictService.php # app/common/model/SysCurrency.php # app/controller/IndexController.php # config/route.php
2025-09-02 11:55:14 +08:00
parent 935caa24f2 749cbb6908
commit da3e5e2a2d
39 changed files with 2214 additions and 51 deletions
@@ -74,8 +74,36 @@ class SysDictService
                break;
            case 'store':
                break;
+            case 'scope':
+                $config['order']['id'] = 'desc';
+                if (isset($p['scope']) && !empty($p['scope'])) {
+                    $config['where']['id'] = ['in', explode(',', $p['scope'])];
+                }
+                $config['with']['sysDictItem'][] = 'dict_id';
+                $config['with']['sysDictItem'][] = 'item_label';
+                $config['with']['sysDictItem'][] = 'item_value';
+                break;
        }

        return $config;
    }
+
+
+    public function serviceListAllScope(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'scope');
+        $result = $this->logicListAll($config);
+        return $this->postProcess('ListAllScope', $result);
+    }
+
+
+    public function afterServiceListAllScope($data)
+    {
+        
+        // $data->each(function (&$item) { 
+
+        // });
+
+        return $data;
+    }
 }