Browse Source

修改部分代码

yuanrf 1 year ago
parent
commit
8d2572ead6

+ 5 - 0
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));

+ 1 - 1
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