删除税费

application/model/OBargainModel.php

@@ -1220,20 +1220,18 @@ class OBargainModel extends Model
         $partial_bargain = $m_partial->getBragainScale($bargain_id);
 
         foreach ($partial_bargain as $val) {
-            $bargain_id_arr[] = $val['bargain_id'];
+            $bargain_id_arr[] = $val['agent_id'];
         }
 
-        if (empty($bargain_id_arr[0])) {
         $data = $this->field('role,agent_id,scale,scale_fee')
             ->where('','EXP','id='.$bargain_id.' OR father_id='.$bargain_id)
-                ->where('is_del', 0)
-                ->select();
-        } else {
-            $data = $this->field('role,agent_id,scale,scale_fee')
-                ->where('id', $bargain_id)
-                ->where('id', 'not in', implode(',', $bargain_id_arr))
-                ->whereOr('is_del', 0)
+            ->where('status', '<>',30)
             ->select();
+
+        foreach ($data as $k=>$v) {
+            if (in_array($v['agent_id'], $bargain_id_arr)) {
+                unset($data[$k]);
+            }
         }
 
         if (!empty($partial_bargain)) {