|
|
@@ -4,6 +4,7 @@ namespace backendApi\modules\v1\models\lists\user;
|
|
|
use backendApi\modules\v1\models\Admin;
|
|
|
use common\helpers\Cache;
|
|
|
use common\libs\dataList\DataListInterface;
|
|
|
+use common\models\Countries;
|
|
|
use common\models\HighestEmpLevelLog;
|
|
|
use common\models\User;
|
|
|
use common\libs\dataList\column\DateTime;
|
|
|
@@ -31,6 +32,7 @@ class ChangeHighestEmpLevelList extends \common\libs\dataList\DataList implement
|
|
|
'join' => [
|
|
|
['LEFT JOIN', Admin::tableName() . ' AS ADM', 'LL.ADMIN_ID=ADM.ID'],
|
|
|
['INNER JOIN', User::tableName() . ' AS CU', 'LL.USER_ID=CU.ID'],
|
|
|
+ ['INNER JOIN', Countries::tableName() . ' AS C', 'CU.COUNTRY_ID=C.ID'],
|
|
|
],
|
|
|
'page' => $this->page,
|
|
|
'pageSize' => $this->pageSize,
|
|
|
@@ -50,6 +52,9 @@ class ChangeHighestEmpLevelList extends \common\libs\dataList\DataList implement
|
|
|
'USER_NAME' => [
|
|
|
'header' => Yii::t('ctx', 'memberCode'),
|
|
|
],
|
|
|
+ 'COUNTRY' => [
|
|
|
+ 'header' => Yii::t('ctx', 'country'),
|
|
|
+ ],
|
|
|
'FROM_HIGHEST_EMP_LV_NAME' => [
|
|
|
'header' => Yii::t('ctx', 'levelBeforeModification'),
|
|
|
'value' => function($row) use($empLevelConfig) {
|