lsm12139 1 ヶ月 前
コミット
c236ca2e84

+ 1 - 1
app/Http/Controllers/API/ApprovalFlowController.php

@@ -40,7 +40,7 @@ class ApprovalFlowController extends Controller
         $exists = ApprovalFlow::query()->where("type", $request->type)
             ->where("company_id", Auth::user()->company_id)->where('name',$request->name)
             ->count();
-        throw_validation_if($exists && !isset($request->node), "Please do not add repeatedly.");
+        throw_validation_if($exists && !isset($request->nodes), "Please do not add repeatedly.");
 
         $approvalFlow = new ApprovalFlow();
         $approvalFlow->mergeFillable([

+ 14 - 0
app/Http/Requests/API/Approval/CreateOrUpdateRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\API\Approval;
 
+use App\Models\ApprovalFlow;
 use App\Models\Enums\ApprovalObjectType;
 use App\Models\Enums\FileObjectType;
 use App\Models\Enums\ObjectApprovalStatus;
@@ -63,6 +64,19 @@ class CreateOrUpdateRequest extends FormRequest
                             $fail('Please select the file to be approved.');
                         }
                     }
+                ],
+                'approvalFlow_id' =>[
+                    'required',
+                    function ($attribute, $value, $fail) {
+                        $exist = ApprovalFlow::query()
+                            ->where("company_id", Auth::user()->company_id)
+                            ->where('id', $value)
+                            ->where('status', 1)
+                            ->count();
+                        if (! $exist) {
+                            $fail('Resources without permission to access.');
+                        }
+                    }
                 ]
             ];
         }

+ 2 - 2
app/Services/Approval/StoreService.php

@@ -19,11 +19,11 @@ class StoreService
     public function store()
     {
         $request = request();
-
         $approvalObjectType = ApprovalObjectType::from($request->object_type);
 
         $approvalObject = $approvalObjectType->modelBuilderAllowed($request->object_id)->findOrFail($request->object_id);
 
+
         $this->checkStatus($approvalObject, $approvalObjectType);
 
 //        $approvalFlow = $this->getApprovalFlow($approvalObjectType, $approvalObject);
@@ -132,7 +132,7 @@ class StoreService
 
     protected function getNewApprovalFlow($id)
     {
-        $approvalFlow = ApprovalFlow::query()->findOrFail($id);
+        $approvalFlow = ApprovalFlow::query() ->where("status", 1)->findOrFail($id);
 
         throw_validation_if(! $approvalFlow, 'Clearly set up approval flow rules first.');