wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix代码生成问题

Browse Source
This commit is contained in:
不做码农 2022-05-09 18:55:03 +08:00
parent d6cd248e10
commit 387d69a8f2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -53,7 +53,7 @@ $end
$end $end
var response = _${replaceDto.ModelTypeName}Repository var response = _${replaceDto.ModelTypeName}Repository
.Queryable() .Queryable()
$if(genTable.SubTableName != "" && genTable.SubTableName != null) $if(null != genTable.SubTableName && "" != genTable.SubTableName)
.Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName})) .Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
$end $end
$if(genTable.SortField != "" && genTable.SortField != null) $if(genTable.SortField != "" && genTable.SortField != null)

2
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -513,7 +513,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto"></param> /// <param name="replaceDto"></param>
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto) private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{ {
//Engine.Current.Clean(); Engine.Current.Clean();
dto.GenTable.Columns = dto.GenTable.Columns.OrderBy(x => x.Sort).ToList(); dto.GenTable.Columns = dto.GenTable.Columns.OrderBy(x => x.Sort).ToList();
bool showCustomInput = dto.GenTable.Columns.Any(f => f.HtmlType.Equals(GenConstants.HTML_CUSTOM_INPUT, StringComparison.OrdinalIgnoreCase)); bool showCustomInput = dto.GenTable.Columns.Any(f => f.HtmlType.Equals(GenConstants.HTML_CUSTOM_INPUT, StringComparison.OrdinalIgnoreCase));
//jnt模板引擎全局变量 //jnt模板引擎全局变量

3
ZR.Service/System/GenTableService.cs
View File

@ -60,8 +60,11 @@ namespace ZR.Service.System
if (info != null && !info.SubTableName.IsEmpty()) if (info != null && !info.SubTableName.IsEmpty())
{ {
info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First(); info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First();
if (info?.SubTable != null)
{
SetTableFromOptions(info?.SubTable); SetTableFromOptions(info?.SubTable);
} }
}
return info; return info;
} }