bug

application/model/OPartialCommission.php

@@ -48,43 +48,19 @@ class OPartialCommission extends BaseModel
         $m_real     = new ORealIncome();
         $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
         foreach ($data as $k => $v) {
-            $result[$k] = $v;
-
             if (isset($v['agent_id'])) {
                 $agent_data                   = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]);
-                $result[$k]['agent']          = $agent_data['name'] . '-' . $agent_data['phone'];
-                $result[$k]['district_store'] = $agent_data['district_name'] . '-' . $agent_data['store_name'];
+                $data[$k]['agent']          = $agent_data['name'] . '-' . $agent_data['phone'];
+                $data[$k]['district_store'] = $agent_data['district_name'] . '-' . $agent_data['store_name'];
             }
 
-            if (isset($v['role'])) {
-                switch ($v['role']) {
-                    case 1 :
-                        $data[$k]['role_name'] = '盘方';
-                        break;
-                    case 2 :
-                        $data[$k]['role_name'] = '客方';
-                        break;
-                    case 3 :
-                        $data[$k]['role_name'] = '反签';
-                        break;
-                    case 4 :
-                        $data[$k]['role_name'] = '独家';
-                        break;
-                    case 5 :
-                        $data[$k]['role_name'] = '合作方';
-                        break;
-                    default :
-                        $data[$k]['role_name'] = '无';
-                }
-            }
             if ($v['father_id'] != 0) {
-                $result[$k]['bargain_id'] = $v['father_id'];
+                $data[$k]['bargain_id'] = $v['father_id'];
             }
-
             //分佣ID
-            $result[$k]['commission_id'] = $v["bargain_id"] ;
+            $data[$k]['commission_id'] = $v["id"] ;
         }
-        return $result;
+        return $data;
     }
 
     /**