成交报告-修改

application/index/controller/Finance.php

@@ -675,7 +675,7 @@ class Finance extends Basic
         }
 
         $m_bargain    = new OBargainModel();
-        $bargain_data = $m_bargain->getCheckBargain('id,agent_id,role', $this->params['bargain_id']);
+        $bargain_data = $m_bargain->getCheckBargain('a.id,a.agent_id,a.role', $this->params['bargain_id']);
 
         //排除成交报告其它状态
         if (empty($bargain_data['id'])) {
@@ -686,7 +686,6 @@ class Finance extends Basic
         $m_partial = new OPartialCommission();
         $data      = $this->params["commission_date"];
 
-
         $add_arr = $update_arr = [];
         $i       = $j = 0;
         foreach ($data as $item) {
@@ -810,7 +809,7 @@ class Finance extends Basic
         }
 
         $m_bargain    = new OBargainModel();
-        $bargain_data = $m_bargain->getCheckBargain('id', $this->params['bargain_id']);
+        $bargain_data = $m_bargain->getCheckBargain('a.id', $this->params['bargain_id']);
 
         //排除成交报告其它状态
         if (empty($bargain_data['id'])) {