开票税费修改

application/model/GHouses.php

@@ -207,7 +207,6 @@ class GHouses extends BaseModel
 
                 $dish_name               = '';
                 $result[$k]['dish_name'] = '';
-                $result[$k]['auth_edit_house'] = 1;
                 foreach ($house_agents as $k2 => $v2) {
                     if ($v['id'] == $v2['houses_id']) {
                         $dish_name               .= $v2['name'] . ',';

application/model/OBargainModel.php

@@ -872,12 +872,16 @@ class OBargainModel extends Model
 
         $data = $this->field('role,agent_id,scale,scale_fee')
                 ->where('id', $bargain_id)
-                ->where('id', 'not in', import(',',$bargain_id_arr))
-                ->whereOr('father_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);
+        }
+
         $m_agent = new AAgents();
-        $result  = [];
+
         foreach ($data as $k => $v) {
 
             if (isset($v['role'])) {