|
@@ -155,15 +155,35 @@ class AdController extends BaseController
|
|
|
// 获取全部分类
|
|
// 获取全部分类
|
|
|
$allLocation = AdLocation::getAllLocation();
|
|
$allLocation = AdLocation::getAllLocation();
|
|
|
|
|
|
|
|
|
|
+ // 管理员关联国家的文章
|
|
|
|
|
+ $admin = Admin::findOne(Yii::$app->user->id);
|
|
|
|
|
+ $roleId = $admin->ROLE_ID;
|
|
|
|
|
+ if ($roleId == \Yii::$app->params['superAdminRoleId']) {
|
|
|
|
|
+ $countries = Countries::find()->asArray()->all();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // 关联国家
|
|
|
|
|
+ $countries = Countries::find()
|
|
|
|
|
+ ->select('COU.ID, COU.CODE, COU.NAME')
|
|
|
|
|
+ ->from(['COU' => Countries::tableName()])
|
|
|
|
|
+ ->join('INNER JOIN', AdminCountry::tableName() . ' AS ADL', 'ADL.COUNTRY_ID = COU.ID')
|
|
|
|
|
+ ->where(['ADL.ADMIN_ID' => $admin->ID])
|
|
|
|
|
+ ->asArray()
|
|
|
|
|
+ ->all();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 关联文章
|
|
// 关联文章
|
|
|
$allArticle = Article::find()
|
|
$allArticle = Article::find()
|
|
|
->from(['ART' => Article::tableName()])
|
|
->from(['ART' => Article::tableName()])
|
|
|
->select('ART.ID,ART.TITLE')
|
|
->select('ART.ID,ART.TITLE')
|
|
|
- ->andFilterWhere(['ART.COUNTRY_ID' => $oneData['COUNTRY_ID']])
|
|
|
|
|
|
|
+ ->andFilterWhere(['ART.COUNTRY_ID' => array_column($countries, 'ID')])
|
|
|
->asArray()
|
|
->asArray()
|
|
|
->all();
|
|
->all();
|
|
|
|
|
|
|
|
- return static::notice(['oneData'=>$oneData, 'allLocation'=>$allLocation, 'allArticle' => $allArticle]);
|
|
|
|
|
|
|
+ return static::notice([
|
|
|
|
|
+ 'oneData' => $oneData,
|
|
|
|
|
+ 'allLocation' => $allLocation,
|
|
|
|
|
+ 'allArticle' => $allArticle,
|
|
|
|
|
+ ]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|