diff --git a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs index b51be987..87e13bd7 100644 --- a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs +++ b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs @@ -529,10 +529,22 @@ namespace JNPF.VisualDev return await ReportExcel(input); #endregion - - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(modelId, true); + VisualDevEntity? templateEntity = templateEntity = await _visualDevService.GetInfoById(modelId, true); + PageResult>? pageList = null; if (input.dataType == "1") input.pageSize = 99999999; - PageResult>? pageList = await _runService.GetListResult(templateEntity, input); + + //导出时列表重写了就调用重写的 modifyby zkd 20241008 + var overideSvc = OverideVisualDevManager.GetOrDefault(modelId); + if (overideSvc != null && overideSvc.OverideFuncs.GetListAsync != null) + { + object result = await overideSvc.OverideFuncs.GetListAsync(input); + pageList = JsonConvert.DeserializeObject>>(JsonConvert.SerializeObject(result)); + } + else + { + pageList = await _runService.GetListResult(templateEntity, input); + } + // 如果是 分组表格 模板 ColumnDesignModel? columnData = templateEntity.ColumnData.ToObject(); // 列配置模型