修改我的团队1.2

app/controller/api/user/User.php

@@ -1368,7 +1368,7 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 593;
+             $teamid = 536;//593
                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
             //var_dump($team_userinfo_old_jbp1);return;
         }
@@ -3686,12 +3686,13 @@ public function processArray($array) {
     public function getPerformance($user_id) {
         $team_amount = 0;
         $person_amount = 0;
-        
+      
         
          $result_big_team_arr = [];
          $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
         //共建联盟业绩 个人联盟业绩 共建联盟总pv 个人联盟业绩pv
         $common_nums = $this->getCommonNums($user_id);
+        //var_dump($user_id);
         $get_teams_comm_num = 0;
         $get_teams_comm_pv = 0;
         //1.0系统中有下级，需要在2.0中再加下级数据
@@ -3704,18 +3705,22 @@ public function processArray($array) {
             //var_dump($common_nums);
             //用户三峡所有在2.0系统下面的业绩和人数 start
             $child_nums = [];
+            //再加上当前用户直属的子级
+            $common_ns = $common_nums;
+            $common_ns[] = $user_id;
+
               //获取当前用户
-            foreach($common_nums as $v){
+            foreach($common_ns as $v){
                 $child_nums[] = $this->getRecursiveChildren($v);
             }
-            
+          
               //梅红在2.0中的ID是780
             if($user_id == 593){
                  $child_nums[0][] = 780;
                 
             }
           
-            
+
             //去除空数组，并重新组合有数据的数组
             $filteredData = array_filter($child_nums, function($array) {
                 return !empty($array); // 如果数组不为空，则保留
@@ -3726,15 +3731,17 @@ public function processArray($array) {
             foreach ($filteredData as $array) {
                 $result_big_team_arr = array_merge($result_big_team_arr, $array);
             }
+          
               //var_dump($result_big_team_arr);echo "ppppppppppppppppp";
             //获取当前用户下面在2.0中的下级所有PV
             $get_teams_comm_pv = $this->getteampv($result_big_team_arr);
          //获取当前用户下面在2.0中的下级所有人数
         $get_teams_comm_num = count($result_big_team_arr);
         //var_dump($get_teams_comm_num);
-           
+           //  var_dump( $get_teams_comm_pv);
             //用户伞下小部门所有在2.0系统下面的业绩和人数 end
         }else{
+          
             //当前用户在1.0没有下级，那直接在新系统2.0找下级获取数据，并区分大小部门
               $child_nums = $this->getChildren($user_id);
               //获取父级子级下面的个人
@@ -3771,7 +3778,7 @@ public function processArray($array) {
         //合并业绩和人数
         $team_amount += $get_teams_comm_pv;
            
-        //var_dump($team_amount);
+       // var_dump($team_amount);
         //1.0获取小区业绩
         $person_nums = $this->getPersonageNums($user_id);
         //var_dump($person_nums);
@@ -3868,7 +3875,7 @@ public function processArray($array) {
         $all_record_nums = $money1180Sum + $money11800Sum + $money10620Sum + round($otherMoneySum * 0.7,2);
         // var_dump($all_record_nums);
         $team_amount += $all_record_nums;
-
+       // var_dump($user_team_amount);
         //计算自己的个人联盟总流水
 
         // // //计算自己的个人联盟总流水