|
|
@@ -2793,7 +2793,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
|
|
|
int endIndex = startIndex + dto.PageSize - 1;
|
|
|
string sql_data = string.Format(@"Select * From (
|
|
|
Select row_number() over (order by f.Id Desc) as RowNumber,f.Id,f.DiId,
|
|
|
- f.PriceName,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
|
|
|
+ f.PriceName,f.PriceType,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
|
|
|
From Fin_GroupExtraCost f
|
|
|
Inner Join Grp_CreditCardPayment c On f.Id = c.CId
|
|
|
Left Join Sys_Users u On f.CreateUserId = u.Id
|
|
|
@@ -2837,7 +2837,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
|
|
|
//系统用户
|
|
|
if (dic_user.ContainsKey(item.CreateUserId))
|
|
|
{
|
|
|
- item.CreateUserIdStr = dic_setData[item.CreateUserId];
|
|
|
+ item.CreateUserIdStr = dic_user[item.CreateUserId];
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -2845,7 +2845,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
|
|
|
if (users != null)
|
|
|
{
|
|
|
item.CreateUserIdStr = users.CnName;
|
|
|
- dic_setData.Add(item.CreateUserId, users.CnName);
|
|
|
+ dic_user.Add(item.CreateUserId, users.CnName);
|
|
|
}
|
|
|
}
|
|
|
|
