Skip to content

Commit b0a6a39

Browse files
committed
fix return
1 parent c641b17 commit b0a6a39

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/RestTrait.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,14 @@ protected function view(array $filter, ServerRequestInterface $request = null):
147147
if (count($keys) > 1 && $id !== null) {
148148
$values = explode(',', $id);
149149
if (count($keys) === count($values)) {
150-
return DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->andWhere(array_combine($keys, $values))->cache($this->getDuration($request), $this->cache)->one();
150+
$data = DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->andWhere(array_combine($keys, $values))->cache($this->getDuration($request), $this->cache)->one();
151151
}
152152
} elseif ($id !== null) {
153-
return $model = DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->andWhere(array_combine($keys, [$id]))->cache($this->getDuration($request), $this->cache)->one();
153+
$data = $model = DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->andWhere(array_combine($keys, [$id]))->cache($this->getDuration($request), $this->cache)->one();
154+
} else {
155+
$data = DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->cache($this->getDuration($request), $this->cache)->one();
154156
}
155-
return DBHelper::search($this->modelClass::find()->alias($alias)->asArray(), $filter)->cache($this->getDuration($request), $this->cache)->one();
157+
return empty($data) ? [] : $data;
156158
}
157159

158160
/**

0 commit comments

Comments
 (0)