diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php index d35a5f9..12f24aa 100755 --- a/frontend/controllers/CabinetController.php +++ b/frontend/controllers/CabinetController.php @@ -213,8 +213,7 @@ ->all(); } else { $reports = Report::find() - ->joinWith('intellectualProperty.creativeRoles') - ->where([ 'creative_role.user_id' => $user->id ]) + ->innerJoinWith('intellectualProperty.creativeRole') ->all(); } diff --git a/frontend/models/IntellectualProperty.php b/frontend/models/IntellectualProperty.php index b06b513..b5db055 100755 --- a/frontend/models/IntellectualProperty.php +++ b/frontend/models/IntellectualProperty.php @@ -97,7 +97,7 @@ public function getCreativeRole() { return $this->hasOne(CreativeRole::className(), [ 'intellectual_property_id' => 'id' ]) - ->where([ 'user_id' => \Yii::$app->user->id ]); + ->where([ 'creative_role.user_id' => \Yii::$app->user->id ]); } /** diff --git a/frontend/views/cabinet/users.php b/frontend/views/cabinet/users.php index 9af2e49..7e52c50 100755 --- a/frontend/views/cabinet/users.php +++ b/frontend/views/cabinet/users.php @@ -3,6 +3,7 @@ use frontend\models\IntellectualProperty; use frontend\models\Report; use yii\helpers\Html; + use yii\helpers\VarDumper; use yii\web\View; use yii\widgets\ActiveForm; use yii\widgets\Pjax; @@ -58,7 +59,7 @@ if ($user->isAdmin()) { $sum = $report->sum; } else { - $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part / 100; + $sum = $report->sum * $report->intellectualProperty->creativeRole->part / 100; } $total += $sum*0.8*0.805; ?> -- libgit2 0.21.4