|
@@ -22,7 +22,7 @@ class VaccineController extends AuthController
|
|
'sort_type' => 'in:0,1,2',
|
|
'sort_type' => 'in:0,1,2',
|
|
]);
|
|
]);
|
|
|
|
|
|
- $builder = Vaccine::join('organization_vaccines', 'organization_vaccines.vaccine_id', '=', 'vaccines.id')->select(['vaccines.id', 'organization_vaccines.id as organization_vaccine_id', 'organization_vaccines.type', 'organization_vaccines.price', 'vaccines.name', 'organization_vaccines.remark', 'organization_vaccines.supplier', 'organization_vaccines.stock'])->where('organization_vaccines.stock', '>', 0)->where('organization_vaccines.org_id', $req['organization_id']);
|
|
|
|
|
|
+ $builder = Vaccine::join('organization_vaccines', 'organization_vaccines.vaccine_id', '=', 'vaccines.id')->select(['vaccines.id', 'organization_vaccines.id as organization_vaccine_id', 'organization_vaccines.type', 'organization_vaccines.price', 'vaccines.name', 'organization_vaccines.remark', 'organization_vaccines.supplier', 'vaccines.stock'])->where('vaccines.stock', '>', 0)->where('organization_vaccines.org_id', $req['organization_id']);
|
|
if (!empty($req['type'])) {
|
|
if (!empty($req['type'])) {
|
|
$builder->where('organization_vaccines.type', $req['type']);
|
|
$builder->where('organization_vaccines.type', $req['type']);
|
|
}
|
|
}
|