|
@@ -53,10 +53,9 @@ class ViolationStoreJobs implements ShouldQueue
|
|
|
$insert_data =['company_id'=>$company_id,'name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
|
|
$insert_data =['company_id'=>$company_id,'name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
|
|
|
$executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
|
|
$executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
|
|
|
}
|
|
}
|
|
|
- $ViolationStoreModel = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_company.category_id')
|
|
|
|
|
- ->where('washconfig_violation_company.status', 0)->where('store_type', 1)->select(['washconfig_violation_company.*','washconfig_company_category.name as category_name']);
|
|
|
|
|
|
|
+ $ViolationStoreModel = $ViolationStoreModel->where('status', 0)->where('store_type', 1);
|
|
|
if($company_id){
|
|
if($company_id){
|
|
|
- $ViolationStoreModel = $ViolationStoreModel->where('washconfig_violation_company.company_id', $company_id);
|
|
|
|
|
|
|
+ $ViolationStoreModel = $ViolationStoreModel->where('company_id', $company_id);
|
|
|
}
|
|
}
|
|
|
$totle_page = 0;
|
|
$totle_page = 0;
|
|
|
$list_config_data = $ViolationStoreModel->paginate($limit, ['*'], 'page', $page)->toarray();
|
|
$list_config_data = $ViolationStoreModel->paginate($limit, ['*'], 'page', $page)->toarray();
|