|
|
|
@ -809,7 +809,12 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ |
|
|
|
|
body.exportSet.ExFields.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
if (columns.Any(o => o.field == x)) |
|
|
|
|
fieldDescs.Add(x, columns.FirstOrDefault(o => o.field == x)?.label); |
|
|
|
|
{ |
|
|
|
|
var label = columns.FirstOrDefault(o => o.field == x)?.label; |
|
|
|
|
if (!fieldDescs.ContainsKey(x)) |
|
|
|
|
fieldDescs.Add(x, label); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
else |
|
|
|
|
fieldDescs = columns.ToDictionary(item => item.field, item => item.label); |
|
|
|
@ -930,8 +935,17 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
object[] array = tempList.ToArray(); |
|
|
|
|
|
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
result.LoadDataRow(array, true); |
|
|
|
|
} |
|
|
|
|
catch (Exception E) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|