feat: NG-15: 新会员注册时增加国家与语言选项.

backendApi/modules/v1/models/lists/user/IndexList.php

@@ -38,7 +38,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
         $this->condition .= ' AND UN.USER_ID=UI.USER_ID AND UN.PARENT_UID=UI.CON_UID';
         $this->listData = User::lists($this->condition, $this->params, [
             'select' => 'U.*,
-                UI.USER_ID, UI.ZC_PV, UI.CON_UID, UI.REC_UID, UI.CON_NUM, UI.REC_NUM, UI.NETWORK_DEEP, 
+                UI.USER_ID, UI.ZC_PV, UI.CON_UID, UI.CON_UID_ACTUAL, UI.REC_UID, UI.CON_NUM, UI.REC_NUM, UI.NETWORK_DEEP, 
                 UI.RELATION_DEEP, UI.SYSTEM_ID, UI.IS_GROUP_LEADER, UI.IS_SYSTEM_LEADER, UI.IS_TEAM, UI.IS_BIND, 
                 UI.IS_TEAM_MAIN, UI.IS_BIND_MAIN, UI.IS_AUTO_WITHDRAW, UI.CLOSE_LOGIN, UI.REG_TYPE, UI.SHOULD_REG_TYPE, 
                 UI.REG_NAME, UI.CREDIT_CODE, UI.PREMISES, UI.LEGAL_PERSON, UI.REG_EXPIRES, UI.STORE_TYPE, UI.INVOICE_BALANCE, 
@@ -47,7 +47,6 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 UI.HIGHEST_EMP_LV_PERIOD, UI.TRANSFER_PROP, UI.LOGIN_NUMS, UI.FAIL_NUMS, UI.LAST_LOGIN_IP, 
                 UI.LAST_LOGIN_AT, UI.SHOW_EMP_LV,UN.RELATIVE_LOCATION,
                 CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,
-                CUA.USER_NAME CON_USER_NAME_ACTUAL,CUA.REAL_NAME CON_REAL_NAME_ACTUAL,
                 RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,
                 DU.USER_NAME DEC_USER_NAME,
                 CS.NAME COUNTRY,
@@ -59,7 +58,6 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 ['LEFT JOIN', UserInfo::tableName() . ' AS UI', 'UI.USER_ID=U.ID'],
                 ['LEFT JOIN', UserNetwork::tableName() . ' AS UN', 'UI.USER_ID=UN.USER_ID'],
                 ['LEFT JOIN', User::tableName() . ' AS CU', 'UI.CON_UID=CU.ID'],
-                ['LEFT JOIN', User::tableName() . ' AS CUA', 'UI.CON_UID=CUA.ID'],
                 ['LEFT JOIN', User::tableName() . ' AS RU', 'UI.REC_UID=RU.ID'],
                 ['LEFT JOIN', User::tableName() . ' AS DU', 'U.DEC_ID=DU.ID'],
                 ['LEFT JOIN', Countries::tableName() . ' AS CS', 'U.COUNTRY_ID=CS.ID'],
@@ -81,6 +79,10 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
             } else {
                 $this->listData['list'][$key]['BTF_URL'] = null;
             }
+
+            $conActual = User::getBaseInfo($value['CON_UID_ACTUAL']);
+            $this->listData['list'][$key]['CON_USER_NAME_ACTUAL'] = $conActual['USER_NAME'] ?? '';
+            $this->listData['list'][$key]['CON_REAL_NAME_ACTUAL'] = $conActual['REAL_NAME'] ?? '';
         }
     }