diff --git a/app/Http/Modules/User/ContractModule.php b/app/Http/Modules/User/ContractModule.php index afc0c4e..e990a0a 100644 --- a/app/Http/Modules/User/ContractModule.php +++ b/app/Http/Modules/User/ContractModule.php @@ -39,6 +39,8 @@ class ContractModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contact.status.active'); $query = Contract::query(); @@ -48,6 +50,8 @@ class ContractModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractObligationDependencyModule.php b/app/Http/Modules/User/ContractObligationDependencyModule.php index 74986ed..cfbef66 100644 --- a/app/Http/Modules/User/ContractObligationDependencyModule.php +++ b/app/Http/Modules/User/ContractObligationDependencyModule.php @@ -36,6 +36,8 @@ class ContractObligationDependencyModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contract_dependency.status.active'); $query = ContractObligationDependency::query(); @@ -45,6 +47,8 @@ class ContractObligationDependencyModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractObligationModule.php b/app/Http/Modules/User/ContractObligationModule.php index 96bc06d..d9f8174 100644 --- a/app/Http/Modules/User/ContractObligationModule.php +++ b/app/Http/Modules/User/ContractObligationModule.php @@ -33,6 +33,8 @@ class ContractObligationModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contact.status.active'); $query = Contract::query(); @@ -42,6 +44,8 @@ class ContractObligationModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractTemplateModule.php b/app/Http/Modules/User/ContractTemplateModule.php index 25f04e5..4641b73 100644 --- a/app/Http/Modules/User/ContractTemplateModule.php +++ b/app/Http/Modules/User/ContractTemplateModule.php @@ -34,15 +34,19 @@ class ContractTemplateModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contact_template.status.active'); $query = ContractTemplate::query(); - if (strlen($name) > 0) { + if (strlen($name) > 0) { $query->where('name', 'like', '%' . $name . '%'); } if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php b/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php index e69d5b4..ff583c6 100644 --- a/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php +++ b/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php @@ -40,6 +40,8 @@ class ContractTemplateObligationContractTemplateDependencyModule extends BaseCon $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contract_template_obligation_contract_template_dependency.status.active'); $query = ContractTemplateObligationContractTemplateDependency::query(); @@ -54,6 +56,8 @@ class ContractTemplateObligationContractTemplateDependencyModule extends BaseCon if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php b/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php index ce89f84..8bd03b7 100644 --- a/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php +++ b/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php @@ -39,6 +39,8 @@ class ContractTemplateObligationDependencyModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.contract_template_obligation_dependency.status.active'); $query = ContractTemplateObligationDependency::query(); @@ -53,6 +55,8 @@ class ContractTemplateObligationDependencyModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/ContractTemplateObligationModule.php b/app/Http/Modules/User/ContractTemplateObligationModule.php index 7cd1d6e..07e031b 100644 --- a/app/Http/Modules/User/ContractTemplateObligationModule.php +++ b/app/Http/Modules/User/ContractTemplateObligationModule.php @@ -33,6 +33,8 @@ class ContractTemplateObligationModule extends BaseController $not_hash_id = $not_id = $request->get('not_id', []); $contract_template_hash_id = $contract_template_id = $request->get('contract_template_id', []); + + $status_default[] = config('constants.contract_template_obligation.status.active'); $name = $request->get('name', null); $status = $request->get('status', []); @@ -57,6 +59,8 @@ class ContractTemplateObligationModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/EntityModule.php b/app/Http/Modules/User/EntityModule.php index 05e9a31..b744a99 100644 --- a/app/Http/Modules/User/EntityModule.php +++ b/app/Http/Modules/User/EntityModule.php @@ -34,6 +34,8 @@ class EntityModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.entity.status.active'); $query = Entity::query(); @@ -43,6 +45,8 @@ class EntityModule extends BaseController if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $query->where('user_id', Auth::guard('user-api')->user()->id); diff --git a/app/Http/Modules/User/EntitySignatureModule.php b/app/Http/Modules/User/EntitySignatureModule.php index 971ea15..5d468fd 100644 --- a/app/Http/Modules/User/EntitySignatureModule.php +++ b/app/Http/Modules/User/EntitySignatureModule.php @@ -36,11 +36,15 @@ class EntitySignatureModule extends BaseController $status = $request->get('status', []); $page = $request->get('page', null); $limit = $request->get('limit', 10); + + $status_default[] = config('constants.entity.status.active'); $query = EntitySignature::query(); if (!empty($status) > 0) { $query->whereIn('status', $status); + }else{ + $query->whereIn('status', $status_default); } $user_id = Auth::guard('user-api')->user()->id;