diff --git a/app/Service/Api/Material/MaterialService.php b/app/Service/Api/Material/MaterialService.php index 91bcbff..dc46d29 100644 --- a/app/Service/Api/Material/MaterialService.php +++ b/app/Service/Api/Material/MaterialService.php @@ -113,9 +113,13 @@ class MaterialService extends BaseService{ { $limit = (int)$this->request->input('limit', 10); $list = $this->MaterialApplication - ->where('is_del',MaterialCode::IS_NO_DEL) - ->where('id', $this->userId) - ->paginate($limit)->toArray(); + ->leftJoin('material', 'material.id', '=', 'material_id') + ->leftJoin('dish', 'dish.id', '=', 'dish_id') + ->leftJoin('admin_user', 'admin_user.id', '=', 'operator_id') + ->where('material_application.is_del',MaterialCode::IS_NO_DEL) + ->where('material_application.operator_id', $this->userId) + ->paginate($limit,['material_application.*','material.name as material_name','dish.dish as dish_name','admin_user.chinese_name as operator_name']) + ->toArray(); return $this->return->success('success',$list); }