office_

application/index/service/OfficeRoomService.php

@@ -1651,7 +1651,8 @@ class OfficeRoomService
     public function getEditLog($house_id) {
         try {
             $m_operating = new OfficeGOperatingRecord();
-            $result['data'] = $m_operating->getList(1, 1000, 'id DESC','agent_id,name,remark,create_time',['house_id'=>$house_id]);
+            $field = 'agent_id,name,remark,create_time';
+            $result['data'] = $m_operating->getList(1, 1000, 'id DESC',$field,['house_id'=>$house_id, 'type'=>['<>',1]]);
             $result['status'] = 'successful';
         } catch (\Exception $e) {
             $result['status'] = 'fail';

application/model/OfficeOBargainModel.php

@@ -469,8 +469,8 @@ class OfficeOBargainModel extends Model
     public function getBargainInfo($field, $params)
     {
         $data = $this->field($field)->alias('a')
-            ->join('o_report b', 'a.report_id = b.id', 'left')
-            ->join('o_order c', 'a.order_id = c.id', 'left')
+            ->join('office_o_report b', 'a.report_id = b.id', 'left')
+            ->join('office_o_order c', 'a.order_id = c.id', 'left')
             ->join('office_g_room d', 'c.house_id = d.id', 'left')
             ->join('office_g_building f', 'd.building_id = f.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')

application/model/OfficeOMarchInModel.php

@@ -348,8 +348,8 @@ class OfficeOMarchInModel extends Model
             ->field($field)
             ->alias('a')
             ->join('a_agents b', 'a.reception_id = b.id', 'left')
-            ->join('o_order c', 'a.order_id = c.id', 'left')
-            ->join('o_report d', 'a.report_id = d.id', 'left')
+            ->join('office_o_order c', 'a.order_id = c.id', 'left')
+            ->join('office_o_report d', 'a.report_id = d.id', 'left')
             ->join('a_store e', 'd.report_store_id = e.id', 'left')
             ->join('office_g_room f', 'c.house_id = f.id', 'left')
             ->join('office_g_building g', 'f.building_id = g.id', 'left')
@@ -372,8 +372,8 @@ class OfficeOMarchInModel extends Model
         return $this->field($field)
             ->alias('a')
             ->join('a_agents b', 'a.reception_id = b.id', 'left')
-            ->join('o_order c', 'a.order_id = c.id', 'left')
-            ->join('o_report d', 'a.report_id = d.id', 'left')
+            ->join('office_o_order c', 'a.order_id = c.id', 'left')
+            ->join('office_o_report d', 'a.report_id = d.id', 'left')
             ->join('a_store e', 'd.report_store_id = e.id', 'left')
             ->join('office_g_room f', 'c.house_id = f.id', 'left')
             ->join('office_g_building g', 'f.building_id = g.id', 'left')

application/model/OfficeOReportModel.php

@@ -760,7 +760,7 @@ class OfficeOReportModel extends Model
         $result = $this->db->field($field)
             ->alias("a")
             ->join("a_agents d", "a.report_agent_id = d.id", "left")
-            ->join("o_order b", "a.id = b.f_id", "left")
+            ->join("office_o_order b", "a.id = b.f_id", "left")
             ->join("office_g_room c", "b.house_id = c.id", "left")
             ->join("office_g_building e", "c.building_id = e.id", "left")
             ->where($params)
@@ -779,7 +779,7 @@ class OfficeOReportModel extends Model
     {
         $result = $this->db->alias("a")
             ->join("a_agents d", "a.report_agent_id = d.id", "left")
-            ->join("o_order b", "a.id = b.f_id", "left")
+            ->join("office_o_order b", "a.id = b.f_id", "left")
             ->join("office_g_room c", "b.house_id = c.id", "left")
             ->join("office_g_building e", "c.building_id = e.id", "left")
             ->where($params)