|
|
@@ -35,7 +35,8 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
|
|
|
*/
|
|
|
public function dataHandle()
|
|
|
{
|
|
|
- $this->condition .= ' AND UN.USER_ID=UI.USER_ID AND UN.PARENT_UID=UI.CON_UID';
|
|
|
+// $this->condition .= ' AND UN.USER_ID=UI.USER_ID AND UN.PARENT_UID=UI.CON_UID';
|
|
|
+ $this->condition .= '';
|
|
|
$this->listData = User::lists($this->condition, $this->params, [
|
|
|
'select' => 'U.*,
|
|
|
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,
|
|
|
@@ -45,7 +46,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
|
|
|
UI.HIGHEST_EMP_LV, UI.CLOSE_LOGIN_AT, UI.PULLED_AT,
|
|
|
UI.GROUP_LEADER_AT, UI.ALLOW_TRANSFER, UI.ALLOW_RECONSUME_SMS, UI.ALLOW_RECONSUME_SMS_TO,
|
|
|
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,
|
|
|
+ UI.LAST_LOGIN_AT, UI.SHOW_EMP_LV,
|
|
|
CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,
|
|
|
RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,
|
|
|
DU.USER_NAME DEC_USER_NAME,
|
|
|
@@ -56,7 +57,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
|
|
|
'from' => User::tableName() . ' AS U',
|
|
|
'join' => [
|
|
|
['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', 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 RU', 'UI.REC_UID=RU.ID'],
|
|
|
['LEFT JOIN', User::tableName() . ' AS DU', 'U.DEC_ID=DU.ID'],
|