|
@@ -269,7 +269,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
Select row_number() over (order by c.IsAuditGM,c.PayPercentage desc) as RowNumber,t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayDid
|
|
|
from
|
|
|
Grp_CarTouristGuideGroundReservations t
|
|
|
- Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id and c.isdel=0
|
|
|
+ left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id and c.isdel=0
|
|
|
left Join Sys_SetData s on s.Id=c.PaymentCurrency {0}
|
|
|
) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
|
|
|
|
|
@@ -288,7 +288,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
string CountSql = string.Format(@"Select COUNT(1) as Count From (
|
|
|
select t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage from
|
|
|
Grp_CarTouristGuideGroundReservations t
|
|
|
- Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id and c.isdel=0
|
|
|
+ left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id and c.isdel=0
|
|
|
left Join Sys_SetData s on s.Id=t.CId {0}
|
|
|
) temp ", sqlWhere);
|
|
|
DataCount dataCount = _sqlSugar.SqlQueryable<DataCount>(CountSql).First();
|