diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs
index cb615b51..bc48cbe2 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs
@@ -9,42 +9,42 @@ namespace Admin.NET.Plugin.ApprovalFlow;
///
/// 审批流流程记录
///
-[SugarTable("ApprovalFlowRecord", "审批流流程记录")]
+[SugarTable(null, "审批流流程记录")]
public class ApprovalFlowRecord : EntityBaseData
{
///
/// 表单名称
///
- [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 255)]
+ [SugarColumn(ColumnDescription = "表单名称", Length = 255)]
public string? FormName { get; set; }
///
/// 表单状态
///
- [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态", Length = 32)]
+ [SugarColumn(ColumnDescription = "表单状态", Length = 32)]
public string? FormStatus { get; set; }
///
/// 表单触发
///
- [SugarColumn(ColumnName = "FormJson", ColumnDescription = "表单触发", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "表单触发", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormJson { get; set; }
///
/// 表单结果
///
- [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormResult { get; set; }
///
/// 流程结构
///
- [SugarColumn(ColumnName = "FlowJson", ColumnDescription = "流程结构", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "流程结构", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FlowJson { get; set; }
///
/// 流程结果
///
- [SugarColumn(ColumnName = "FlowResult", ColumnDescription = "流程结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "流程结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FlowResult { get; set; }
}
\ No newline at end of file
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs
index f70060dd..3146cd71 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs
@@ -9,54 +9,54 @@ namespace Admin.NET.Plugin.ApprovalFlow;
///
/// 审批流表单
///
-[SugarTable("ApprovalForm", "审批流表单")]
+[SugarTable(null, "审批流表单")]
public class ApprovalForm : EntityBaseData
{
///
/// 编号
///
- [SugarColumn(ColumnName = "Code", ColumnDescription = "编号", Length = 32)]
+ [SugarColumn(ColumnDescription = "编号", Length = 32)]
public string? Code { get; set; }
///
/// 名称
///
- [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 32)]
+ [SugarColumn(ColumnDescription = "名称", Length = 32)]
public string? Name { get; set; }
///
/// 表单名称
///
- [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 32)]
+ [SugarColumn(ColumnDescription = "表单名称", Length = 32)]
public string? FormName { get; set; }
///
/// 表单属性
///
- [SugarColumn(ColumnName = "FormType", ColumnDescription = "表单属性", Length = 32)]
+ [SugarColumn(ColumnDescription = "表单属性", Length = 32)]
public string? FormType { get; set; }
///
/// 表单状态
///
- [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态")]
+ [SugarColumn(ColumnDescription = "表单状态")]
public int? FormStatus { get; set; }
///
/// 表单结果
///
- [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormResult { get; set; }
///
/// 状态
///
- [SugarColumn(ColumnName = "Status", ColumnDescription = "状态")]
+ [SugarColumn(ColumnDescription = "状态")]
public int? Status { get; set; }
///
/// 备注
///
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "备注", Length = 255)]
+ [SugarColumn(ColumnDescription = "备注", Length = 255)]
public string? Remark { get; set; }
}
\ No newline at end of file
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs
index d6923321..78dc14ec 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs
@@ -9,48 +9,48 @@ namespace Admin.NET.Plugin.ApprovalFlow;
///
/// 审批流表单记录
///
-[SugarTable("ApprovalFormRecord", "审批流表单记录")]
+[SugarTable(null, "审批流表单记录")]
public class ApprovalFormRecord : EntityBaseData
{
///
/// 流程Id
///
- [SugarColumn(ColumnName = "FlowId", ColumnDescription = "流程Id")]
+ [SugarColumn(ColumnDescription = "流程Id")]
public long? FlowId { get; set; }
///
/// 表单名称
///
- [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 32)]
+ [SugarColumn(ColumnDescription = "表单名称", Length = 32)]
public string? FormName { get; set; }
///
/// 表单类型
///
- [SugarColumn(ColumnName = "FormType", ColumnDescription = "表单类型", Length = 32)]
+ [SugarColumn(ColumnDescription = "表单类型", Length = 32)]
public string? FormType { get; set; }
///
/// 表单状态
///
- [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态", Length = 11)]
+ [SugarColumn(ColumnDescription = "表单状态", Length = 11)]
public string? FormStatus { get; set; }
///
/// 修改前
///
- [SugarColumn(ColumnName = "FormBefore", ColumnDescription = "修改前", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "修改前", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormBefore { get; set; }
///
/// 修改后
///
- [SugarColumn(ColumnName = "FormAfter", ColumnDescription = "修改后", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "修改后", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormAfter { get; set; }
///
/// 表单结果
///
- [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+ [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? FormResult { get; set; }
}
\ No newline at end of file
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs
index bc833f71..9c167bea 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs
@@ -34,16 +34,17 @@ public class ApprovalFlowMiddleware
private readonly RequestDelegate _next;
private readonly SysApprovalService _sysApprovalService;
- public ApprovalFlowMiddleware(RequestDelegate next, SysApprovalService sysApprovalService)
+ public ApprovalFlowMiddleware(RequestDelegate next)
{
_next = next;
- _sysApprovalService = sysApprovalService;
+ _sysApprovalService = App.GetRequiredService();
}
- public async Task Invoke(HttpContext context)
+ public async Task InvokeAsync(HttpContext context)
{
await _sysApprovalService.MatchApproval(context);
- await _next.Invoke(context);
+ // 调用下一个中间件
+ await _next(context);
}
}
\ No newline at end of file