|
|
@@ -1368,9 +1368,10 @@ class User extends BaseController
|
|
1368
|
1368
|
|
|
1369
|
1369
|
|
|
1370
|
1370
|
if($teamid == 592){
|
|
1371
|
|
- $teamid = 536;//593
|
|
|
1371
|
+ $teamid = 360;//593
|
|
1372
|
1372
|
$team_userinfo_old_jbp1 = $this->getPerformance($teamid);
|
|
1373
|
|
- //var_dump($team_userinfo_old_jbp1);return;
|
|
|
1373
|
+ return;
|
|
|
1374
|
+ //var_dump($team_userinfo_old_jbp1);return;
|
|
1374
|
1375
|
}
|
|
1375
|
1376
|
|
|
1376
|
1377
|
|
|
|
@@ -3692,6 +3693,7 @@ public function processArray($array) {
|
|
3692
|
3693
|
$get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
|
|
3693
|
3694
|
//共建联盟业绩 个人联盟业绩 共建联盟总pv 个人联盟业绩pv
|
|
3694
|
3695
|
$common_nums = $this->getCommonNums($user_id);
|
|
|
3696
|
+
|
|
3695
|
3697
|
//var_dump($user_id);
|
|
3696
|
3698
|
$get_teams_comm_num = 0;
|
|
3697
|
3699
|
$get_teams_comm_pv = 0;
|
|
|
@@ -3708,7 +3710,7 @@ public function processArray($array) {
|
|
3708
|
3710
|
//再加上当前用户直属的子级
|
|
3709
|
3711
|
$common_ns = $common_nums;
|
|
3710
|
3712
|
$common_ns[] = $user_id;
|
|
3711
|
|
-
|
|
|
3713
|
+ //var_dump($common_ns);return;
|
|
3712
|
3714
|
//获取当前用户
|
|
3713
|
3715
|
foreach($common_ns as $v){
|
|
3714
|
3716
|
$child_nums[] = $this->getRecursiveChildren($v);
|
|
|
@@ -3725,6 +3727,8 @@ public function processArray($array) {
|
|
3725
|
3727
|
$filteredData = array_filter($child_nums, function($array) {
|
|
3726
|
3728
|
return !empty($array); // 如果数组不为空,则保留
|
|
3727
|
3729
|
});
|
|
|
3730
|
+
|
|
|
3731
|
+
|
|
3728
|
3732
|
|
|
3729
|
3733
|
// 合并所有非空数组
|
|
3730
|
3734
|
|
|
|
@@ -3735,6 +3739,7 @@ public function processArray($array) {
|
|
3735
|
3739
|
//var_dump($result_big_team_arr);echo "ppppppppppppppppp";
|
|
3736
|
3740
|
//获取当前用户下面在2.0中的下级所有PV
|
|
3737
|
3741
|
$get_teams_comm_pv = $this->getteampv($result_big_team_arr);
|
|
|
3742
|
+
|
|
3738
|
3743
|
//获取当前用户下面在2.0中的下级所有人数
|
|
3739
|
3744
|
$get_teams_comm_num = count($result_big_team_arr);
|
|
3740
|
3745
|
//var_dump($get_teams_comm_num);
|
|
|
@@ -3789,11 +3794,16 @@ public function processArray($array) {
|
|
3789
|
3794
|
|
|
3790
|
3795
|
//用户三峡所有在2.0系统下面的业绩和人数 start
|
|
3791
|
3796
|
$child_nums_mix = [];
|
|
|
3797
|
+
|
|
|
3798
|
+ //再加上当前用户直属的子级
|
|
|
3799
|
+ $common_ns1 = $person_nums;
|
|
|
3800
|
+ $common_ns1[] = $user_id;
|
|
|
3801
|
+
|
|
3792
|
3802
|
//获取当前用户
|
|
3793
|
|
- foreach($person_nums as $v){
|
|
|
3803
|
+ foreach($common_ns1 as $v){
|
|
3794
|
3804
|
$child_nums_mix[] = $this->getRecursiveChildren($v);
|
|
3795
|
3805
|
}
|
|
3796
|
|
-
|
|
|
3806
|
+
|
|
3797
|
3807
|
//去除空数组,并重新组合有数据的数组
|
|
3798
|
3808
|
$filteredData_1 = array_filter($child_nums_mix, function($array) {
|
|
3799
|
3809
|
return !empty($array); // 如果数组不为空,则保留
|