Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.SignalR;
 using MySqlX.XDevAPI.Relational;
 using NPOI.HSSF.UserModel;
 using NPOI.SS.Format;
+using NPOI.SS.Formula.Functions;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
@@ -11000,9 +11001,6 @@ ORDER by  gctggrc.id DESC
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostHotelReservationsAddOrEdit(HotelReservationsAddOrEditDto _dto)
         {
-
-          
-
             #region  参数验证
             if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
             if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
@@ -11058,15 +11056,22 @@ ORDER by  gctggrc.id DESC
                 if (_dto.Id == 0) content = $"[新增-酒店费用录入({groupInfo?.TeamName ?? "-"})]一项费用：{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
                 else if (_dto.Id > 0) content = $"[更新-酒店费用录入({groupInfo?.TeamName ?? "-"})]一项费用：{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
 
-                Logs($"【iOS推送通知Exception】Start");
-                await GeneralMethod.iOS_PushNotifications("051", title, "", content);
-                Logs($"【iOS推送通知Exception】End ");
+                Logs($"【iOS推送通知Exceptio1】Start");
+
+                try
+                {
+                    var iosRes = await GeneralMethod.iOS_PushNotifications("051", title, "", content);
+                    Logs($"【iOS推送通知Exception2】End Response:[{JsonConvert.SerializeObject(iosRes)}]");
+                }
+                catch (Exception ex )
+                {
+
+                    Logs($"【iOS推送通知Exception2-1】[{ex.Message}]");
+                }
 
             }
             catch (Exception ex)
             {
-                _logger.LogInformation($"【iOS推送通知Exception】【{ex.Message}】");
-                Log.Error($"【iOS推送通知Exception】【{ex.Message}】");
                 Logs($"【iOS推送通知Exception】【{ex.Message}】");
             }