新增开票税费修改

application/model/OBargainModel.php

@@ -862,7 +862,7 @@ class OBargainModel extends Model
      */
     public function getAgentTypeByBargainId(int $bargain_id): array
     {
-
+        $result = [];
         $m_partial = new OPartialCommission();
         $partial_bargain = $m_partial->getBragainScale($bargain_id);
 
@@ -870,11 +870,18 @@ class OBargainModel extends Model
             $bargain_id_arr[] = $val['bargain_id'];
         }
 
-        $data = $this->field('role,agent_id,scale,scale_fee')
+        if (empty($bargain_id_arr[0])) {
+            $data = $this->field('role,agent_id,scale,scale_fee')
+                ->where('id', $bargain_id)
+                ->whereOr('father_id', $bargain_id)
+                ->select();
+        } else {
+            $data = $this->field('role,agent_id,scale,scale_fee')
                 ->where('id', $bargain_id)
                 ->where('id', 'not in', implode(',',$bargain_id_arr))
 //                ->whereOr('father_id', $bargain_id)
                 ->select();
+        }
 
         if (!empty($partial_bargain)) {
             $data = array_merge($partial_bargain, $data);