Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/index/controller/Finance.php

@@ -1800,9 +1800,8 @@ class Finance extends Basic
         if (empty($this->params['bargain_id'])) {
             return $this->response(101, '成交报告id为空');
         }
-
+        $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission,a.create_time';
         if ($this->request->isGet()) {
-            $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission';
             $data  = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]);
             return $this->response(200, '', $data);
         }
@@ -1816,7 +1815,7 @@ class Finance extends Basic
         }
 
         //检查成交报告是否存在
-        $data_arr = $this->m_bargain->getBargainPartialDetail('a.id,a.agent_id,a.create_time', [ 'id' => $this->params['bargain_id'] ]);
+        $data_arr = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]);
 
         if (empty($data_arr['id'])) {
             return $this->response(101, '没有成交报告信息');
@@ -1923,7 +1922,7 @@ class Finance extends Basic
         if (!empty($where)) {
             //获取被修改人信息
             $m_agent    = new AAgents();
-            $agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', [ 'b.id' => $bargain_id ]);
+            $agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', $where);
             $this->updatePerformanceData($agent_data['id'], $agent_data['create_time'], $agent_data['store_id'],$agent_data['district_id']);
         }