确保非空引用并简化代码

- 将 GroupsController.cs 中的多个选择器添加非空断言，确保 `CurrencyCode` 和 `Country` 不为空。
- 简化 GroupsController.cs 中的 `cityData1` 变量声明。
- 修改 APNsService.cs 中的静态字符串初始化，避免空引用异常。
- 在 IAPNsService.cs 中的 `PushNotification1` 方法增加了 `isTarget`、`viewCode` 和 `pageParam` 参数注释。
- 注释掉 GeneralMethod.cs 中的 `groupNumber` 变量。
- 在 Library.cs 中的 `SendUserMsg_GroupStatus_AuditFee` 方法增加了 `qwEnum` 参数注释。
- 将 QiYeWeChatApiService.cs 中的 `userid` 添加非空断言，确保不为空。
- 修改 ChatHub.cs 中的 `OnDisconnectedAsync` 方法，允许 `exception` 参数为空。
- 将 Grp_NationalTravelFee.cs 中的 `Country` 属性改为非空。

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5387,8 +5387,7 @@ FROM
 
                 };
 
-            string[] currencyCodeArray = _currencyInfos.Select(it => it.CurrencyCode).ToArray();
-            var _currencyRate = await _juHeApi.PostItemRateAsync(currencyCodeArray);
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             if (_currencyRate.Count > 0)
             {
                 foreach (var item in _currencyInfos)
@@ -5431,8 +5430,7 @@ FROM
 
             //默认币种显示
             var _currencyInfos = _currencyInit;
-
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             List<dynamic> reteInfos = new List<dynamic>();
             if (_currencyRate.Count > 0)
             {
@@ -7352,13 +7350,13 @@ FROM
 
             List<string> countryData = new List<string>();
 
-            countryData.AddRange(nationalTravelFeeData.Select(it => it.Country).ToList());
+            countryData.AddRange(nationalTravelFeeData.Select(it => it.Country!).ToList());
             countryData = countryData.Distinct().ToList();
 
             List<dynamic> dataSource = new List<dynamic>();
             foreach (var item in countryData)
             {
-                List<string> cityData1 = new List<string>();
+                var cityData1 = new List<string>();
                 cityData1 = nationalTravelFeeData.Where(it => it.Country == item).Select(it => it.City).ToList();
                 var countryData2 = new
                 {
@@ -7577,7 +7575,7 @@ FROM
 
                 };
 
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             if (_currencyRate.Count > 0)
             {
                 foreach (var item in _currencyInfos)
@@ -7621,8 +7619,7 @@ FROM
 
             //默认币种显示
             var _currencyInfos = _currencyInit;
-
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             List<dynamic> reteInfos = new List<dynamic>();
             if (_currencyRate.Count > 0)
             {
@@ -9057,7 +9054,7 @@ FROM
             //默认币种显示
             var _currencyInfos = _currencyInit;
 
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             if (_currencyRate.Count > 0)
             {
                 foreach (var item in _currencyInfos)
@@ -9263,7 +9260,7 @@ WHERE
             {
                 //默认币种显示
                 var _currencyInfos = _currencyInit;
-                var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+                var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
                 List<dynamic> reteInfos = new List<dynamic>();
                 if (_currencyRate.Count > 0)
                 {
@@ -10463,7 +10460,7 @@ WHERE
             //默认币种显示
             var _currencyInfos = _currencyInit;
 
-            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+            var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
             if (_currencyRate.Count > 0)
             {
                 foreach (var item in _currencyInfos)
@@ -10621,7 +10618,8 @@ WHERE
             {
                 //默认币种显示
                 var _currencyInfos = _currencyInit;
-                var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
+
+                var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode!).ToArray());
                 List<dynamic> reteInfos = new List<dynamic>();
                 if (_currencyRate.Count > 0)
                 {

OASystem/OASystem.Api/OAMethodLib/APNs/APNsService.cs

@@ -33,8 +33,8 @@ namespace OASystem.API.OAMethodLib.APNs
     /// </summary>
     public class APNsService : IAPNsService
     {
-        static string token = null;
-        static string baseUrl = null;
+        static string token = string.Empty;
+        static string baseUrl = string.Empty;
 
         private readonly ILogger<APNsService> _logger;
         //private static readonly HttpClient _httpClientFactory = new HttpClient { BaseAddress = new Uri("https://api.push.apple.com:443/3/device/") };

OASystem/OASystem.Api/OAMethodLib/APNs/IAPNsService.cs

@@ -29,6 +29,9 @@
         /// <param name="title">标题</param>
         /// <param name="subtitle">子标题</param>
         /// <param name="body">通知内容</param>
+        /// <param name="isTarget"></param>
+        /// <param name="viewCode"></param>
+        /// <param name="pageParam"></param>
         /// <returns></returns>
         Task<Result> PushNotification1(string apnsTopic, string deviceToken, NotificationType type, string title, string subtitle, string body, bool isTarget, string viewCode, PageParam_PriceAuditH5 pageParam);
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -3984,7 +3984,7 @@ namespace OASystem.API.OAMethodLib
 
                         string missionLeader = "";  //团负责人默认接团客户名单第一个人
                         string missionLeaderJob = "";//负责人job
-                        int groupNumber = 0; //团人数
+                        //int groupNumber = 0; //团人数
                         if (DeleClientList.Count > 0)
                         {
                             missionLeader = DeleClientList[0]?.Name ?? "";

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Library.cs

@@ -389,6 +389,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
         /// </summary>
         /// <param name="Grp_CreditCardPaymentId"></param>
         /// <param name="userId"></param>
+        /// <param name="qwEnum"></param>
         /// <returns></returns>
         public static async Task<bool> SendUserMsg_GroupStatus_AuditFee(int Grp_CreditCardPaymentId, List<string> userId, QiyeWeChatEnum qwEnum)
         {

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -433,7 +433,8 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
 
             checkInReq.starttime = (uint)(startDt - _1970).TotalSeconds;
             checkInReq.endtime = (uint)(endDt - _1970).TotalSeconds;
-            checkInReq.useridlist = userIdListView.dept_user.Select(it => it.userid).ToList();
+            checkInReq.useridlist = userIdListView.dept_user.Select(it => it.userid!).ToList();
+
 
             var json = System.Text.Json.JsonSerializer.Serialize(checkInReq);
             var content = new StringContent(json, Encoding.UTF8, "application/json");
@@ -646,7 +647,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
 
             checkInReq.starttime = (uint)(startDt - _1970).TotalSeconds;
             checkInReq.endtime = (uint)(endDt - _1970).TotalSeconds;
-            checkInReq.useridlist = userIdListView.dept_user.Select(it => it.userid).ToList();
+            checkInReq.useridlist = userIdListView.dept_user.Select(it => it.userid!).ToList();
 
             var json = System.Text.Json.JsonSerializer.Serialize(checkInReq);
             var content = new StringContent(json, Encoding.UTF8, "application/json");

OASystem/OASystem.Api/OAMethodLib/SignalR/Hubs/ChatHub.cs

@@ -93,7 +93,7 @@ namespace OASystem.API.OAMethodLib.Hub.Hubs
         /// </summary>
         /// <param name="exception"></param>
         /// <returns></returns>
-        public override Task OnDisconnectedAsync(Exception exception)
+        public override Task OnDisconnectedAsync(Exception? exception)
         {
             var connId = Context.ConnectionId;
             _logger.LogInformation($"Client ConnectionId=> [[{connId}]] Already Close Connection Server!");

OASystem/OASystem.Domain/Entities/Groups/Grp_NationalTravelFee.cs

@@ -23,7 +23,7 @@ namespace OASystem.Domain.Entities.Groups
         /// 国家
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string? Country { get; set; }
+        public string Country { get; set; }
 
         /// <summary>
         /// 城市