as2252258/kiri-databases
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

变更

Browse Source
This commit is contained in:
向林
2022-09-29 18:58:32 +08:00
parent 02eddb98a2
commit 322168ff68
5 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Traits/HasBase.php
+4 -5
View File
@@ -40,12 +40,12 @@ abstract class HasBase implements \Database\Traits\Relation
/**
* HasBase constructor.
* @param ModelInterface $model
* @param $primaryId
* @param string $primaryId
* @param $value
* @param Relation $relation
* @throws Exception
*/
public function __construct(mixed $model, $primaryId, $value, Relation $relation)
public function __construct(mixed $model, public string $primaryId, $value, Relation $relation)
{
if (!class_exists($model)) {
throw new Exception('Model must implement ' . $model);
@@ -60,10 +60,9 @@ abstract class HasBase implements \Database\Traits\Relation
$_model = $model::query()->where(['t1.' . $primaryId => $value]);
}
$this->_relation = $relation->bindIdentification($model . '_' . $primaryId . '_' . $value, $_model);
$this->value = is_array($value) ? json_encode($value,JSON_UNESCAPED_UNICODE) : $value;
$this->_relation = $relation->bindIdentification($model . '_' . $primaryId . '_' . $this->value, $_model);
$this->model = $model;
$this->value = $value;
}