1

REBORN.Module.DMCModule/VisaModule.cs

@@ -3844,12 +3844,12 @@ TEL:03-3779-9111";
                 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
                 {
                     IsAdmin = false;
-                    model.CreateBy = 0;
+                    //model.CreateBy = 0;
                 }
                 else if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckBranchOrder"))//查看公司下的订单信息
                 {
                     IsAdmin = false;
-                    model.CreateBy = 0;
+                    //model.CreateBy = 0;
                     model.RB_Branch_Id = userInfo.RB_Branch_id;
                 }
             }

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -1173,9 +1173,9 @@ namespace REBORN.Module.SellModule
 
                         #region 推送企微机器人消息
                         var mpcModel = messagePushConfigRepository.GetList(new RB_MessagePushConfig { SendType = "1", RB_Group_Id = demodel.GroupId })?.FirstOrDefault() ?? new RB_MessagePushConfig();
-                        if ( userInfo.SimpleEasy == 1 && !string.IsNullOrWhiteSpace(mpcModel?.WeChatBotWebhookUrl ?? "") && (mpcModel?.WeChatBotEnabled ?? 0) == 1)
+                        if (userInfo.SimpleEasy == 1 && !string.IsNullOrWhiteSpace(mpcModel?.WeChatBotWebhookUrl ?? "") && (mpcModel?.WeChatBotEnabled ?? 0) == 1)
                         {
-                          
+
                             string jdName = hotel?.Name;
                             if (demodel.GroupId == 2)
                             {
@@ -1278,12 +1278,12 @@ namespace REBORN.Module.SellModule
                 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
                 {
                     IsAdmin = false;
-                    query.EnterID = 0;
+                    //query.EnterID = 0;
                 }
                 else if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckBranchOrder"))//查看公司下的订单信息
                 {
                     IsAdmin = false;
-                    query.EnterID = 0;
+                    //query.EnterID = 0;
                     query.EmpBranchId = userInfo.RB_Branch_id;
                 }
             }
@@ -3620,7 +3620,7 @@ namespace REBORN.Module.SellModule
 
                     // var dictModel = dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = demodel.GroupId, DictKey = "Client_OrderPush_Url" }).FirstOrDefault();
                     var mpcModel = messagePushConfigRepository.GetList(new RB_MessagePushConfig { SendType = "1", RB_Group_Id = demodel.GroupId })?.FirstOrDefault() ?? new RB_MessagePushConfig();
-                    if ( userInfo.SimpleEasy == 1 && !string.IsNullOrWhiteSpace(mpcModel?.WeChatBotWebhookUrl ?? "") && (mpcModel?.WeChatBotEnabled ?? 0) == 1)
+                    if (userInfo.SimpleEasy == 1 && !string.IsNullOrWhiteSpace(mpcModel?.WeChatBotWebhookUrl ?? "") && (mpcModel?.WeChatBotEnabled ?? 0) == 1)
                     {
                         string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? "";
 
@@ -3667,12 +3667,12 @@ namespace REBORN.Module.SellModule
                 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
                 {
                     IsAdmin = false;
-                    query.EnterID = 0;
+                    //query.EnterID = 0;
                 }
                 else if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckBranchOrder"))//查看公司下的订单信息
                 {
                     IsAdmin = false;
-                    query.EnterID = 0;
+                    //query.EnterID = 0;
                     query.EmpBranchId = userInfo.RB_Branch_id;
                 }
             }
@@ -5315,7 +5315,7 @@ namespace REBORN.Module.SellModule
                     var mpcModel = messagePushConfigRepository.GetList(new RB_MessagePushConfig { SendType = "1", RB_Group_Id = demodel.GroupId })?.FirstOrDefault() ?? new RB_MessagePushConfig();
                     if (userInfo.SimpleEasy == 1 && !string.IsNullOrWhiteSpace(mpcModel?.WeChatBotWebhookUrl ?? "") && (mpcModel?.WeChatBotEnabled ?? 0) == 1)
                     {
-                       // string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? "";
+                        // string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? "";
 
                         //新增订单，推送消息
                         Dictionary<string, string> dic = new Dictionary<string, string>

REBORN.Module.SellModule/SellOrderModule.cs

@@ -14712,12 +14712,12 @@ namespace REBORN.Module.SellModule
                 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
                 {
                     isMyOrder = 1;
-                    model.CreateBy = 0;
+                    //model.CreateBy = 0;
                 }
                 else if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckBranchOrder"))//查看公司下的订单信息
                 {
                     isMyOrder = 1;
-                    model.CreateBy = 0;
+                    //model.CreateBy = 0;
                     model.BranchId = userInfo.RB_Branch_id;
                 }
             }
@@ -16875,12 +16875,13 @@ namespace REBORN.Module.SellModule
                 string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id);
                 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
                 {
-                    model.CreateBy = 0;
+                    isMyOrder = 1;
+                    //model.CreateBy = 0;
                 }
                 else if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckBranchOrder"))//查看公司下的订单信息
                 {
                     isMyOrder = 1;
-                    model.CreateBy = 0;
+                    //model.CreateBy = 0;
                     model.BranchId = userInfo.RB_Branch_id;
                 }
             }