|
|
@@ -687,7 +687,7 @@ class SharedProsperityUserRepository extends BaseRepository
|
|
687
|
687
|
$uid = $userData->uid;
|
|
688
|
688
|
}
|
|
689
|
689
|
|
|
690
|
|
- $where[] = ['user_id', '=', $uid];
|
|
|
690
|
+ $where[] = ['a.user_id', '=', $uid];
|
|
691
|
691
|
}
|
|
692
|
692
|
|
|
693
|
693
|
// 昵称搜索
|
|
|
@@ -697,22 +697,23 @@ class SharedProsperityUserRepository extends BaseRepository
|
|
697
|
697
|
if ($userData) {
|
|
698
|
698
|
$uid = $userData->uid;
|
|
699
|
699
|
}
|
|
700
|
|
- $where[] = ['user_id', '=', $uid];
|
|
|
700
|
+ $where[] = ['a.user_id', '=', $uid];
|
|
701
|
701
|
}
|
|
702
|
702
|
|
|
703
|
703
|
// 合伙人等级搜索
|
|
704
|
704
|
if (isset($params['partner_level']) && $params['partner_level']) {
|
|
705
|
|
- $where[] = ['partner_level', '=', $params['partner_level']];
|
|
|
705
|
+ $where[] = ['a.partner_level', '=', $params['partner_level']];
|
|
706
|
706
|
}
|
|
707
|
707
|
|
|
708
|
708
|
// 共富团等级搜索
|
|
709
|
709
|
if (isset($params['user_group']) && $params['user_group']) {
|
|
710
|
|
- /** @var SharedProsperityGroupUserDao $groupUserDao */
|
|
711
|
|
- $groupUserDao = app()->make(SharedProsperityGroupUserDao::class);
|
|
712
|
|
- $groupUserData = $groupUserDao->getUserByLevel($params['user_group']);
|
|
713
|
|
- $uids = array_column($groupUserData['data'], 'user_id');
|
|
714
|
|
- $where[] = ['user_id', 'in', $uids];
|
|
715
|
|
- $page = 1;
|
|
|
710
|
+ // /** @var SharedProsperityGroupUserDao $groupUserDao */
|
|
|
711
|
+ // $groupUserDao = app()->make(SharedProsperityGroupUserDao::class);
|
|
|
712
|
+ // $groupUserData = $groupUserDao->getUserByLevel($params['user_group']);
|
|
|
713
|
+ // $uids = array_column($groupUserData['data'], 'user_id');
|
|
|
714
|
+ // $where[] = ['user_id', 'in', $uids];
|
|
|
715
|
+ // $page = 1;
|
|
|
716
|
+ $where[] = ['b.group_id', '=', $params['user_group']];
|
|
716
|
717
|
}
|
|
717
|
718
|
|
|
718
|
719
|
$list = $this->dao->adminList($where, $page);
|