Преглед на файлове

feat: EK-856: 管理员增加“Country”属性.

kevinElken преди 10 месеца
родител
ревизия
96de7ec0e2
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      backendApi/modules/v1/controllers/UserController.php

+ 7 - 1
backendApi/modules/v1/controllers/UserController.php

@@ -1175,13 +1175,19 @@ class UserController extends BaseController
         $data['allNation'] = \Yii::$app->params['nation'];
         $data['allNation'] = \Yii::$app->params['nation'];
         $data['region'] = Region::getByCountryId($userInfo['COUNTRY_ID']);
         $data['region'] = Region::getByCountryId($userInfo['COUNTRY_ID']);
         $data['language'] = Language::getFromCache();
         $data['language'] = Language::getFromCache();
-        $data['country'] = Countries::getFromCache();
         $data['allOpenBank'] = OpenBank::find()
         $data['allOpenBank'] = OpenBank::find()
             ->where('STATUS=:STATUS AND COUNTRY_ID=:COUNTRY_ID', [':STATUS' => 1, ':COUNTRY_ID' => $userInfo['COUNTRY_ID']])
             ->where('STATUS=:STATUS AND COUNTRY_ID=:COUNTRY_ID', [':STATUS' => 1, ':COUNTRY_ID' => $userInfo['COUNTRY_ID']])
             ->orderBy('BANK_NAME ASC')
             ->orderBy('BANK_NAME ASC')
             ->asArray()
             ->asArray()
             ->all();
             ->all();
 
 
+        $adminId = Yii::$app->getUser()->getUserInfo()['id'];
+        $adminCountry = AdminCountry::getCountry($adminId);
+
+        $countries = Countries::getFromCache();
+        $countries = array_filter($countries, fn($country) => in_array($country['ID'], $adminCountry));
+        $data['country'] = array_values($countries);
+
         $data['userInfo'] = [
         $data['userInfo'] = [
             'userId' => $userInfo['ID'],
             'userId' => $userInfo['ID'],
             'nation' => \Yii::$app->params['nation'][$userInfo['NATION']]['name']??'',
             'nation' => \Yii::$app->params['nation'][$userInfo['NATION']]['name']??'',