excel

application/index/controller/OfficePerformanceInfo.php

@@ -222,7 +222,7 @@ class OfficePerformanceInfo extends Basic
         $field .= 'Obargain.father_id,';
         $field .= 'Obargain.trade_type,';
         $field .= 'Obargain.agent_id,';//分佣方ID
-        $field .= 'Houses.internal_address,';
+        $field .= 'Houses.address as internal_address,';
         $field .= 'Oorder.house_id,';
         $field .= 'Obargain.price,';//pricec成交价格
         $field .= 'Agent.name,';

application/model/OfficeOBargainModel.php

@@ -1438,7 +1438,8 @@ class OfficeOBargainModel extends Model
             ->alias("Obargain")
             ->join("office_o_report Oreport", "Obargain.report_id = Oreport.id", "left")
             ->join("office_o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
-            ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
+            ->join("office_g_room Room", "Oorder.house_id    = Room.id", "left")
+            ->join("office_g_building Houses", "Room.building_id = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
 //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
 //            ->join('a_district District', 'Agent.district_id = District.id', 'left')