|
|
@@ -152,28 +152,11 @@ class AdController extends BaseController
|
|
|
// 获取全部分类
|
|
|
$allLocation = AdLocation::getAllLocation();
|
|
|
|
|
|
- // 如果admin不是超管,只允许查询自己关联的国家
|
|
|
- $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();
|
|
|
- }
|
|
|
-
|
|
|
- $countryIds = array_column($countries, 'ID');
|
|
|
// 关联文章
|
|
|
$allArticle = Article::find()
|
|
|
->from(['ART' => Article::tableName()])
|
|
|
->select('ART.ID,ART.TITLE')
|
|
|
- ->andFilterWhere(['ART.COUNTRY_ID' => $countryIds])
|
|
|
+ ->andFilterWhere(['ART.COUNTRY_ID' => $oneData['COUNTRY_ID']])
|
|
|
->asArray()
|
|
|
->all();
|
|
|
|