v3.4.6
This commit is contained in:
@@ -7,21 +7,18 @@ using JNPF.Common.Extension;
|
||||
using JNPF.Common.Filter;
|
||||
using JNPF.Common.Models.NPOI;
|
||||
using JNPF.Common.Security;
|
||||
using JNPF.DatabaseAccessor;
|
||||
using JNPF.DataEncryption;
|
||||
using JNPF.DependencyInjection;
|
||||
using JNPF.DynamicApiController;
|
||||
using JNPF.FriendlyException;
|
||||
using JNPF.VisualDev.Engine;
|
||||
using JNPF.VisualDev.Engine.Core;
|
||||
using JNPF.VisualDev.Engine.Security;
|
||||
using JNPF.VisualDev.Entitys;
|
||||
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
|
||||
using JNPF.VisualDev.Interfaces;
|
||||
using Mapster;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Yitter.IdGenerator;
|
||||
|
||||
namespace JNPF.VisualDev;
|
||||
|
||||
@@ -284,7 +281,6 @@ public class VisualdevModelAppService : IDynamicApiController, ITransient
|
||||
public async Task<dynamic> Export(string modelId, [FromBody] VisualDevModelListQueryInput input)
|
||||
{
|
||||
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(modelId, true);
|
||||
List<VisualDevModelDataEntity> list = new List<VisualDevModelDataEntity>();
|
||||
PageResult<Dictionary<string, object>>? pageList = await _runService.GetListResult(templateEntity, input);
|
||||
|
||||
#region 如果是 分组表格 模板
|
||||
@@ -409,7 +405,7 @@ public class VisualdevModelAppService : IDynamicApiController, ITransient
|
||||
|
||||
var len = rowChildDatas.Select(x => x.Value.Count()).OrderByDescending(x => x).FirstOrDefault();
|
||||
|
||||
if (len > 0)
|
||||
if (len != null && len > 0)
|
||||
{
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user