瀏覽代碼

命名规则关联字段导入调整

kely 4 月之前
父節點
當前提交
718d596d0b

+ 0 - 4
app/Http/Requests/API/CustomField/CreateOrUpdateRequest.php

@@ -42,10 +42,6 @@ class CreateOrUpdateRequest extends FormRequest
     public function importRules(): array
     {
         return [
-            'naming_rule_id'=>[
-                'required',
-                Rule::exists('naming_rules', 'id')->where($this->userCompanyWhere()),
-            ],
             'key' => 'required',
             'type' => [
                 'required',

+ 7 - 1
app/Imports/NameRuleImport.php

@@ -5,7 +5,9 @@ namespace App\Imports;
 use App\Http\Requests\API\CustomField\CreateOrUpdateRequest;
 use App\Models\CustomField;
 use App\Models\CustomOptions;
+use App\Models\NamingRule;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
@@ -14,6 +16,11 @@ class NameRuleImport implements ToCollection, WithHeadingRow
     use ImportValidatorHelper;
     public function collection(Collection $collection)
     {
+        $group=request()->group;
+        $namingRule = NamingRule::query()->where("company_id", Auth::user()->company_id)->where("id", $group)->first();
+        if (! $namingRule) {
+            return $this->forbidden('Naming rule does not exist');
+        }
         $requestRule = new CreateOrUpdateRequest();
 
         $this->validatorByCollection($collection,$requestRule->importRules());
@@ -26,7 +33,6 @@ class NameRuleImport implements ToCollection, WithHeadingRow
         foreach ($collection as $item){
             $key = $item->get('key');
             $type = $item->get('type');
-            $group = $item->get('naming_rule_id');
 
             if (!isset($seenKeys[$key])) {
                 $keys[$key] = $type;

二進制
public/template/import/namingRule.xlsx