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

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -393,6 +393,11 @@ namespace OASystem.API.Controllers
                         teamRateModels = teamRateModelInfo;
                     }
 
+                    if (teamRateModels.TeamRates == null)
+                    {
+                        teamRateModels.TeamRates = new List<TeamRateDescAddCurrencyIdView>();
+                    }
+
                     #endregion
 
                     return Ok(JsonView(true, "操作成功!", teamRateModels));

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -275,7 +275,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 else if (dto.PortType == 2 || dto.PortType == 3)
                 {
                     string sql = string.Format(@"Select * From (	
-                                            Select row_number() over (order by c.IsAuditGM,c.PayPercentage desc) as RowNumber,t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayDid
+                                            Select row_number() over (order by c.IsAuditGM,c.PayPercentage desc) as RowNumber,t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayDid,c.PayMoney
                                             from 
                                             Grp_CarTouristGuideGroundReservations t
                                             left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id  and c.isdel=0

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

@@ -139,7 +139,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 
                 string sql = string.Format(@"select Id,DiId,InviterArea,Inviter,InviteTime,InviteCost,(select name from Sys_SetData where id=i.InviteCurrency and IsDel={0}) 
                                              as Currency,IsGoOfficaiaBussiness,(select IsAuditGM from Grp_CreditCardPayment where CTable=81 and CId=i.Id 
-                                             and IsDel={0}) as 'isAudit',Attachment from Grp_InvitationOfficialActivities i  {1}", 0, sqlWhere);
+                                             and IsDel={0}) as 'isAudit',Attachment from Grp_InvitationOfficialActivities i  {1} order by i.id  desc", 0, sqlWhere);
                 List<InvitationOfficialActivitiesView> _DecreasePayments = await _sqlSugar.SqlQueryable<InvitationOfficialActivitiesView>(sql).ToListAsync();
                 if (_DecreasePayments.Count != 0)
                 {