|
|
@@ -68,23 +68,23 @@ class AdminController extends BaseController
|
|
|
]);
|
|
|
|
|
|
// 遍历查询管理员关联国家,只返回国家CODE AS COUNTRY_CODE
|
|
|
- foreach ($data['list'] as &$value) {
|
|
|
- // 跳过超管
|
|
|
- if ($value['ROLE_ID'] == \Yii::$app->params['superAdminRoleId']) {
|
|
|
- $value['COUNTRY_CODE'] = '';
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
- $countryCode = AdminCountry::find()
|
|
|
- ->from(AdminCountry::tableName() . ' AS AC')
|
|
|
- ->join('INNER JOIN', Countries::tableName() . ' AS COU', 'AC.COUNTRY_ID=COU.ID')
|
|
|
- ->select('COU.CODE AS COUNTRY_CODE')
|
|
|
- ->where(['AC.ADMIN_ID COLLATE utf8mb4_unicode_ci' => $value['ID']])
|
|
|
- ->asArray()
|
|
|
- ->column();
|
|
|
-
|
|
|
- $value['COUNTRY_CODE'] = implode(',', $countryCode);
|
|
|
- }
|
|
|
+// foreach ($data['list'] as &$value) {
|
|
|
+// // 跳过超管
|
|
|
+// if ($value['ROLE_ID'] == \Yii::$app->params['superAdminRoleId']) {
|
|
|
+// $value['COUNTRY_CODE'] = '';
|
|
|
+// continue;
|
|
|
+// }
|
|
|
+//
|
|
|
+// $countryCode = AdminCountry::find()
|
|
|
+// ->from(AdminCountry::tableName() . ' AS AC')
|
|
|
+// ->join('INNER JOIN', Countries::tableName() . ' AS COU', 'AC.COUNTRY_ID=COU.ID')
|
|
|
+// ->select('COU.CODE AS COUNTRY_CODE')
|
|
|
+// ->where(['AC.ADMIN_ID' => $value['ID']])
|
|
|
+// ->asArray()
|
|
|
+// ->column();
|
|
|
+//
|
|
|
+// $value['COUNTRY_CODE'] = implode(',', $countryCode);
|
|
|
+// }
|
|
|
|
|
|
return static::notice($data);
|
|
|
}
|