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

backendApi/modules/v1/controllers/AdminController.php

@@ -41,17 +41,8 @@ class AdminController extends BaseController
         $filter = $this->filterCondition([
             'ADMIN_NAME' => 'A.ADMIN_NAME',
             'REAL_NAME' => 'A.REAL_NAME',
-//            'REMARK' => 'A.REMARK',
             'ROLE_NAME' => 'AR.ROLE_NAME',
             'IS_ENABLE' => 'A.IS_ENABLE',
-//            'LOGIN_NUMS' => 'A.LOGIN_NUMS',
-//            'LAST_LOGIN_IP' => 'A.LAST_LOGIN_IP',
-//            'LAST_LOGIN_AT' => 'A.LAST_LOGIN_AT',
-//            'BIND_IP' => 'A.BIND_IP',
-//            'CREATED_AT' => 'A.CREATED_AT',
-//            'UPDATED_AT' => 'A.UPDATED_AT',
-//            'CREATE_ADMIN_NAME' => 'ADMC.ADMIN_NAME',
-//            'UPDATE_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
         ]);
 
         $join = [
@@ -71,7 +62,6 @@ class AdminController extends BaseController
             $join[] = ['INNER JOIN', AdminCountry::tableName() . ' AS AC', "AC.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ") AND AC.ADMIN_ID=A.ID"];
         }
 
-
         $condition = $filter['condition'];
         $condition .= ' AND A.IS_DEL=0';
         $params = $filter['params'];

backendApi/modules/v1/models/AdminForm.php

@@ -39,7 +39,7 @@ class AdminForm extends Model
     {
         return [
             [['id', 'adminName', 'realName', 'oldPassword', 'password', 'surePassword', 'roleId', 'remark', 'isEnable', 'isModifyPassword', 'bindIp'], 'trim'],
-            [['id', 'adminName', 'realName', 'roleId', 'countryId'], 'required'],
+            [['id', 'adminName', 'realName', 'roleId'], 'required'],
             [['password', 'surePassword'], 'required', 'on'=>['add', 'changePassword', 'noLoginModifyPassword']],
             [['adminName', 'oldPassword'], 'required', 'on'=>['noLoginModifyPassword']],
             [['adminName'], 'unique', 'targetClass'=>Admin::class, 'targetAttribute'=>'ADMIN_NAME', 'on'=>['add']],
@@ -55,8 +55,8 @@ class AdminForm extends Model
     {
         $parentScenarios =  parent::scenarios();
         $customScenarios = [
-            'add' => ['adminName', 'realName', 'password', 'surePassword', 'roleId', 'remark', 'isEnable', 'isModifyPassword', 'bindIp', 'countryId'],
-            'edit' => ['id', 'password', 'surePassword', 'roleId', 'realName', 'remark', 'isEnable', 'isModifyPassword', 'bindIp', 'countryId'],
+            'add' => ['adminName', 'realName', 'password', 'surePassword', 'roleId', 'remark', 'isEnable', 'isModifyPassword', 'bindIp'],
+            'edit' => ['id', 'password', 'surePassword', 'roleId', 'realName', 'remark', 'isEnable', 'isModifyPassword', 'bindIp'],
             'changePassword' => ['password', 'surePassword'],
             'noLoginModifyPassword' => ['adminName', 'oldPassword', 'password', 'surePassword'],
             'changeLanguage' => ['adminName', 'lang'],