diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index bf53e15503d5fe39fdb8ab070f7ac55652ed2bec..aab6d3506c2a4827f4d17294b1c0df5847a6671c 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -261,7 +261,7 @@ class ResController $check = Validator::stringType()->notEmpty()->validate($data['clause']); $check = $check && Validator::stringType()->notEmpty()->validate($data['select']); if(!empty($data['withFile'])){ - $check = $check && Validator::boolType()->validate($withFile); + $check = $check && Validator::boolType()->validate($data['withFile']); } if(!empty($data['orderBy'])){ @@ -297,9 +297,9 @@ class ResController } $resources = ResModel::getOnView(['select' => $select, 'where' => $where, 'orderBy' => $orderBy, 'limit' => $limit]); - if($withFile === true){ + if($data['withFile'] === true){ foreach($resources as &$res){ - $path = ResDocserverModel::getSourceResourcePath(['resId' => $res['res_id'], 'resTable' => 'res_view_letterbox', 'adrTable' => 'null']); + $path = ResDocserverModel::getSourceResourcePath(['resId' => $res['res_id'], 'resTable' => 'res_letterbox', 'adrTable' => 'null']); $file = file_get_contents($path); $base64Content = base64_encode($file); $res['fileBase64Content'] = $base64Content;