cief/unity
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/unity.git synced 2026-08-19 04:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

-by default select active status

Browse Source
This commit is contained in:
weiken.intex
2021-07-21 15:31:23 +08:00
parent 0d1bfa0188 0d1bfa0188
commit b6cc5889e1
9 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Modules/User/ContractModule.php
+4
View File
@@ -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);
app/Http/Modules/User/ContractObligationDependencyModule.php
+4
View File
@@ -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);
app/Http/Modules/User/ContractObligationModule.php
+4
View File
@@ -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);
app/Http/Modules/User/ContractTemplateModule.php
+5 -1
View File
@@ -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);
app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php
+4
View File
@@ -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);
app/Http/Modules/User/ContractTemplateObligationDependencyModule.php
+4
View File
@@ -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);
app/Http/Modules/User/ContractTemplateObligationModule.php
+4
View File
@@ -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);
app/Http/Modules/User/EntityModule.php
+4
View File
@@ -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);
app/Http/Modules/User/EntitySignatureModule.php
+4
View File
@@ -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;