|
|
@@ -280,7 +280,7 @@ class UserRelation extends \common\components\ActiveRecord
|
|
|
$table = self::getTableNameFromPeriod($periodNum);
|
|
|
$db = $table['db'];
|
|
|
$tableName = $table['tableName'];
|
|
|
- return $db->createCommand("SELECT USER_ID,PARENT_UID,TOP_DEEP FROM {$tableName} WHERE PARENT_UID=:PARENT_UID ORDER BY {$orderBy}")->bindValues([':PARENT_UID'=>$userId])->queryAll();
|
|
|
+ return $db->createCommand("SELECT USER_ID,PARENT_UID,TOP_DEEP FROM {$tableName} AS AT INNER JOIN AR_USER U ON AT.USER_ID = U.ID AND U.DELETED=0 WHERE PARENT_UID=:PARENT_UID ORDER BY {$orderBy}")->bindValues([':PARENT_UID'=>$userId])->queryAll();
|
|
|
}
|
|
|
|
|
|
|