From 8bc9b56c1c63d5fa89c8c7297f3544f73759c842 Mon Sep 17 00:00:00 2001
From: vguanyiwgd <v-guanyiw.gd@chinatelecom.cn>
Date: Fri, 2 Aug 2024 11:09:29 +0800
Subject: [PATCH 1/2] update

Change-Id: Iad71859961f09675dbc1dd71368c2ae2e6ccd7a9
---
 backstage/application/backstage/controllers/Meal.php | 2 ++
 1 file changed, 2 insertions(+)

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']);

From a1eb3eca2353f3f7e1a84dd35d2deaa693f38802 Mon Sep 17 00:00:00 2001
From: vguanyiwgd <v-guanyiw.gd@chinatelecom.cn>
Date: Fri, 2 Aug 2024 14:50:10 +0800
Subject: [PATCH 2/2] update

Change-Id: Ie319e265a76f739b037557583411d55d932a1757
---
 backstage/application/api/controllers/api/Order.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);