From 8a44cce44ae2466aee7e1639019ff9b514163614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8-=E6=98=93-=E6=9D=A8?= <6403849@qq.com>
Date: Thu, 9 Oct 2025 12:47:15 +0800
Subject: [PATCH] =?UTF-8?q?Null=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Admin.NET/Admin.NET.Core/CodeGen/Models/CodeGenColumnConfig.cs | 2 +-
.../CodeGen/Strategies/Base/CodeGenTableStrategyBase.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/Admin.NET.Core/CodeGen/Models/CodeGenColumnConfig.cs b/Admin.NET/Admin.NET.Core/CodeGen/Models/CodeGenColumnConfig.cs
index e7d94253..b9292780 100644
--- a/Admin.NET/Admin.NET.Core/CodeGen/Models/CodeGenColumnConfig.cs
+++ b/Admin.NET/Admin.NET.Core/CodeGen/Models/CodeGenColumnConfig.cs
@@ -84,7 +84,7 @@ public class CodeGenColumnConfig : SysCodeGenColumn
///
/// 状态字段
///
- public bool IsStatus => PropertyName == nameof(BaseStatusInput.Status) && DictConfig.Code.Trim('?') == nameof(StatusEnum);
+ public bool IsStatus => PropertyName == nameof(BaseStatusInput.Status) && DictConfig.Code?.Trim('?') == nameof(StatusEnum);
///
/// 是否要联表
diff --git a/Admin.NET/Admin.NET.Core/CodeGen/Strategies/Base/CodeGenTableStrategyBase.cs b/Admin.NET/Admin.NET.Core/CodeGen/Strategies/Base/CodeGenTableStrategyBase.cs
index c5465124..8f562a09 100644
--- a/Admin.NET/Admin.NET.Core/CodeGen/Strategies/Base/CodeGenTableStrategyBase.cs
+++ b/Admin.NET/Admin.NET.Core/CodeGen/Strategies/Base/CodeGenTableStrategyBase.cs
@@ -122,7 +122,7 @@ public abstract class CodeGenTableStrategyBase : CodeGenStrategy where T :
// input.ColumnList = await CodeGenColumnService.GetColumnList(new BaseIdInput{ Id = codeGen.TableList.First().Id }); // 数据库字段列表,
input.IsOnlyIdPrimary = input.AllFields.Where(u => u.IsPrimarykey).All(u => u.PropertyName == "Id"); // 是否主键只有Id
- input.HasStatus = input.AllFields.Any(u => u.PropertyName == nameof(BaseStatusInput.Status) && u.DictConfig.Code.Trim('?') == nameof(StatusEnum)); // 是否有启用禁用字段
+ input.HasStatus = input.AllFields.Any(u => u.PropertyName == nameof(BaseStatusInput.Status) && u.DictConfig.Code?.Trim('?') == nameof(StatusEnum)); // 是否有启用禁用字段
input.HasJoinTable = input.AllFields.Any(e => e.EffectType is CodeGenEffectTypeEnum.ForeignKey or CodeGenEffectTypeEnum.ApiTreeSelector); // 是否有联表
input.HasUpload = input.UploadFields.Count != 0; // 是否有上传