excel

application/index/service/OfficeRoomService.php

@@ -1618,7 +1618,7 @@ class OfficeRoomService
 
         if ($room_data['is_exclusive_type'] != $data['is_exclusive_type']) {
             //是否独家0否1是
-            if ($room_data['is_exclusive_type']) {
+            if ($data['is_exclusive_type']) {
                 $remark[] = '是否独家改为是';
             } else {
                 $remark[] = '是否独家改为否';

application/model/OfficeORefundModel.php

@@ -244,11 +244,11 @@ class OfficeORefundModel extends Model{
     public function getCheckRefundListForExcel($order_ = 'id desc', $field = '', $params = '') {
         return $this->db_->alias('a')
             ->field($field)
-            ->join('o_order b', 'a.order_id = b.id', 'left')
+            ->join('office_o_order b', 'a.order_id = b.id', 'left')
             ->join('a_agents c', 'a.agent_id = c.id', 'left')
-            ->join('o_paylog d', 'a.pay_log_id = d.id', 'left')
-            ->join('o_refund_log e', 'a.id = e.refund_id', 'left')
-            ->join('o_bargain f', 'd.bargain_id = f.id', 'left')
+            ->join('office_o_paylog d', 'a.pay_log_id = d.id', 'left')
+            ->join('office_o_refund_log e', 'a.id = e.refund_id', 'left')
+            ->join('office_o_bargain f', 'd.bargain_id = f.id', 'left')
             ->where($params)
             ->order($order_)
             ->group('a.id')