diff --git a/backstage/application/api/controllers/api/Order.php b/backstage/application/api/controllers/api/Order.php index 067f57a..10cdd96 100644 --- a/backstage/application/api/controllers/api/Order.php +++ b/backstage/application/api/controllers/api/Order.php @@ -1716,7 +1716,7 @@ where // 韶关小岛 判断订单转让 $ol->show_transfer = 0; // 转让按钮 $ol->order_transfer_name = null; - if($this->user->company_id == 58 || $this->user->company_id == 17){ + if($this->user->company_id == 58 || $this->user->company_id == 17 || $this->user->company_id == 55 ){ // 获取该订单是否已被转让 $order_transfer_info = $this->db->query("select * from tb_meal_transfer where oid='{$ol->id}' and status>='0'")->row_array(); $order_rule = $this->Mealtransfer_model->get_order_rule_info($ol->date_id); diff --git a/backstage/application/backstage/controllers/Meal.php b/backstage/application/backstage/controllers/Meal.php index b4d4a88..27a9da8 100644 --- a/backstage/application/backstage/controllers/Meal.php +++ b/backstage/application/backstage/controllers/Meal.php @@ -289,6 +289,8 @@ class Meal extends CI_Controller{ $s = array(); $s['text'] = $info['notes']; $field['notes'] = json_encode($s); + }else{ + $field['notes'] = ''; } if($info['end_time_type'] == 2){ $arr = explode(':',$info['end_time']);