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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1909,7 +1909,7 @@ namespace OASystem.API.Controllers
                             }
                             else
                             {
-                                item.BankNo = item.BankType + ":" + item.BankNo.Substring(0, 3);
+                                item.BankNo = item.BankType + ":" + item.BankNo?.Substring(0, 3);
                             }
                             item.PrePrice = System.Decimal.Round(item.PrePrice, 2);
                             item.Price = System.Decimal.Round(item.Price, 2);
@@ -1922,7 +1922,7 @@ namespace OASystem.API.Controllers
 
                         designer.SetDataSource("ExportCountCost", countCost + "(" + AirTicketReservations[0].CurrencyStr);
                         designer.Process();
-                        string fileName = "AirfareStatement/" + diName + "机票费用报表" + "_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
+                        string fileName = ("AirfareStatement/" + diName + "机票费用报表" + "_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx").Replace(":", "");
                         designer.Workbook.Save(AppSettingsHelper.Get("ExcelBasePath") + fileName);
                         string rst = AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath") + fileName;
                         return Ok(JsonView(true, "成功", url = rst));

OASystem/OASystem.Api/appsettings.json

@@ -146,6 +146,7 @@
     {
       "CTableId": 79, //CtableId 车/导游地接
       "PageIdDatas": [ //页面Id
+        30
       ]
     },
     {

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -54,7 +54,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     else
                     {
                         InvitationOfficialActivitiesByIdView invitation = _mapper.Map<InvitationOfficialActivitiesByIdView>(grp_Invitation);
-
+                        res_InvitationOfficialActivityData ??= new Res_InvitationOfficialActivityData();
                         invitation.PayDId = grp_CreditCard.PayDId;
                         invitation.OrbitalPrivateTransfer = grp_CreditCard.OrbitalPrivateTransfer;
                         invitation.Payee = grp_CreditCard.Payee;
@@ -231,7 +231,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             res_InvitationData.UnitName = dto.Inviter;
                             res_InvitationData.Delegation = dto.DiId.ToString();
                             Res_InvitationOfficialActivityData ifNullUp = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().FirstAsync
-                                (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName);
+                                (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName && a.IsDel == 0);
                             if (ifNullUp == null)///添加或修改商邀资料
                             {
                                 res_InvitationData.Remark = dto.OtherInformation;
@@ -384,7 +384,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         res_InvitationData.Country = dto.InviterArea;
                         res_InvitationData.UnitName = dto.Inviter;
                         Res_InvitationOfficialActivityData ifNullUp = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().FirstAsync
-                            (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName);
+                            (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName && a.IsDel == 0);
                         if (ifNullUp == null)///添加或修改商邀资料
                         {
                             res_InvitationData.Remark = dto.OtherInformation;