|
@@ -38,18 +38,9 @@ class ApprovalFlowController extends Controller
|
|
|
|
|
|
|
|
|
$exists = ApprovalFlow::query()->where("type", $request->type)
|
|
|
- ->when(! $limitObject, fn($query) => $query->where("object_id", 0))
|
|
|
- ->when(
|
|
|
- $limitObject,
|
|
|
- fn ($query) => $query->where([
|
|
|
-// 'object_type' => $request->object_type,
|
|
|
-// 'object_id' => $request->object_id,
|
|
|
- 'name' => $request->name,
|
|
|
- 'company_id' => Auth::user()->company_id,
|
|
|
- ])
|
|
|
- )
|
|
|
+ ->where("company_id", Auth::user()->company_id)->where('name',$request->name)
|
|
|
->count();
|
|
|
-// throw_validation_if($exists && !isset($request->id), "Please do not add repeatedly.");
|
|
|
+ throw_validation_if($exists && !isset($request->node), "Please do not add repeatedly.");
|
|
|
|
|
|
$approvalFlow = new ApprovalFlow();
|
|
|
$approvalFlow->mergeFillable([
|
|
@@ -61,8 +52,6 @@ class ApprovalFlowController extends Controller
|
|
|
'object_id' => $limitObject ? $request->object_id : 0,
|
|
|
'company_id' => Auth::user()->company_id,
|
|
|
'created_by' => Auth::id(),
|
|
|
- 'nodes' => $nodes ??[],
|
|
|
- 'nodes_config' => json_encode($request->nodes??[]),
|
|
|
]);
|
|
|
if (!$exists){
|
|
|
$approvalFlow->save();
|