gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG:模板生成的Page拉口MySQL下出错

Browse Source
This commit is contained in:
yzp 2024-12-18 14:56:50 +08:00
parent 1b0aa27e53
commit 67485c6dc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
View File

@ -319,9 +319,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
/// <summary> /// <summary>
/// 获取库表信息 /// 获取库表信息
/// </summary> /// </summary>
/// <param name="containSysTable"></param> /// <param name="excludeSysTable">是否排除带SysTable属性的表</param>
/// <returns></returns> /// <returns></returns>
private async Task<IEnumerable<EntityInfo>> GetEntityInfos(bool containSysTable = false) private async Task<IEnumerable<EntityInfo>> GetEntityInfos(bool excludeSysTable = false)
{ {
var types = new List<Type>(); var types = new List<Type>();
if (_codeGenOptions.EntityAssemblyNames != null) if (_codeGenOptions.EntityAssemblyNames != null)
@ -357,7 +357,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
foreach (var ct in cosType) foreach (var ct in cosType)
{ {
// 若实体贴[SysTable]特性，则禁止显示系统自带的 // 若实体贴[SysTable]特性，则禁止显示系统自带的
if (containSysTable && ct.IsDefined(typeof(SysTableAttribute), false)) if (excludeSysTable && ct.IsDefined(typeof(SysTableAttribute), false))
continue; continue;
var des = ct.GetCustomAttributes(typeof(DescriptionAttribute), false); var des = ct.GetCustomAttributes(typeof(DescriptionAttribute), false);

2
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
View File

@ -120,7 +120,7 @@ if (@column.QueryWhether == "Y"){
@:.Select<@(@Model.ClassName)Output>(); @:.Select<@(@Model.ClassName)Output>();
} }
@if(@Model.TableField.Any(x=>x.EffectType == "ForeignKey")){ @if(@Model.TableField.Any(x=>x.EffectType == "ForeignKey")){
@:return await query.OrderBuilder(input,"[u].","[@(PKName)]").ToPagedListAsync(input.Page, input.PageSize); @:return await query.OrderBuilder(input,"u.","@(PKName)").ToPagedListAsync(input.Page, input.PageSize);
} else { } else {
@:return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); @:return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
} }