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

backendApi/modules/v1/controllers/AdminController.php

@@ -71,7 +71,7 @@ class AdminController extends BaseController
         ]);
 
         foreach ($data['list'] as &$admin) {
-            $admin['countryId'] = AdminCountry::find()->select('COUNTRY_ID')->where(['ADMIN_ID' => $admin['ID']])->column();
+            $admin['countryId'] = AdminCountry::getCountry($admin['ID']);
         }
 
         return static::notice($data);
@@ -111,10 +111,11 @@ class AdminController extends BaseController
         }
 
         $oneData = Admin::findOneAsArray(['ID' => $id]);
-        $adminCountry = AdminCountry::find()->select('COUNTRY_ID')->where(['ADMIN_ID' => $id])->column();
+        $adminCountry = AdminCountry::getCountry($id);
         // 获取全部管理员角色
         $adminRoles = Cache::getAdminRole();
         return static::notice([
+            'adminRoles' => $adminRoles,
             'oneData' => [
                 'adminName' => $oneData['ADMIN_NAME'],
                 'realName' => $oneData['REAL_NAME'],
@@ -122,10 +123,9 @@ class AdminController extends BaseController
                 'isEnable' => (bool)$oneData['IS_ENABLE'],
                 'isModifyPassword' => (bool)$oneData['IS_MODIFY_PASSWORD'],
                 'bindIp' => $oneData['BIND_IP'],
-                'roleId' => $oneData['ROLE_ID']],
-                'adminRoles' => $adminRoles,
+                'roleId' => $oneData['ROLE_ID'],
                 'countryId' => $adminCountry,
-            ]);
+            ]]);
     }
 
     /**

backendApi/modules/v1/models/AdminCountry.php

@@ -44,4 +44,13 @@ class AdminCountry extends ActiveRecord
             'COUNTRY_ID' => '国家ID',
         ];
     }
+
+    /**
+     * @param $adminId
+     * @return array
+     */
+    public static function getCountry($adminId): array
+    {
+        return self::find()->select('COUNTRY_ID')->where(['ADMIN_ID' => $adminId])->column();
+    }
 }