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

OASystem/OASystem.Api/appsettings.json

@@ -228,7 +228,7 @@
         {
           "PostId": -1,
           "PageIds": [
-            42, //Page： 日常费用付款申请
+            42 //Page： 日常费用付款申请
             //16 //Page： 员工资料列表
           ]
         }

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -100,7 +100,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                              Left Join Sys_SetData sd2 On sd2.Id = atr.PreCurrency
                                              Left Join Sys_SetData sd3 On sd3.Id = atr.Currency
                                              Where atr.IsDel = 0 And atr.DIId={0} 
-                                             Order By atr.CreateTime desc", dto.DiId);
+                                             Order By atr.FlightsDate Asc", dto.DiId);
                 List<AirTicketReservationsView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsView>(sql).ToList();
 
                 foreach (var item in _AirTicketReservations)
@@ -882,13 +882,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
             try
             {
                 string sql = string.Format(@"Select atr.*,ccp.IsAuditGM,sd1.Name As 'CTypeName',sd2.Name As 'PreCurrencyStr',sd3.Name  As CurrencyStr
-From Grp_AirTicketReservations atr
-Left Join Grp_CreditCardPayment ccp On atr.Id = ccp.CId  And atr.DIId = ccp.DIId And ccp.IsDel = 0
-Left Join Sys_SetData sd1 On sd1.Id = atr.ctype
-Left Join Sys_SetData sd2 On sd2.Id = atr.PreCurrency
-Left Join Sys_SetData sd3 On sd3.Id = atr.Currency
-Where atr.IsDel = 0 And atr.DIId={0} And atr.CreateUserId = {1}
-Order By atr.CreateTime desc", dto.DiId, dto.UserId);
+                                             From Grp_AirTicketReservations atr
+                                             Left Join Grp_CreditCardPayment ccp On atr.Id = ccp.CId  And atr.DIId = ccp.DIId And ccp.IsDel = 0
+                                             Left Join Sys_SetData sd1 On sd1.Id = atr.ctype
+                                             Left Join Sys_SetData sd2 On sd2.Id = atr.PreCurrency
+                                             Left Join Sys_SetData sd3 On sd3.Id = atr.Currency
+                                             Where atr.IsDel = 0 And atr.DIId={0} And atr.CreateUserId = {1}
+                                             Order By atr.FlightsDate Asc", dto.DiId);
                 List<AirTicketReservationsPayView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsPayView>(sql).ToList();
                 if (_AirTicketReservations.Count != 0)
                 {