diff --git a/server/model/system/sys_export_template.go b/server/model/system/sys_export_template.go
index d5919280f..aef24617d 100644
--- a/server/model/system/sys_export_template.go
+++ b/server/model/system/sys_export_template.go
@@ -13,7 +13,7 @@ type SysExportTemplate struct {
TableName string `json:"tableName" form:"tableName" gorm:"column:table_name;comment:表名称;"` //表名称
TemplateID string `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识;"` //模板标识
TemplateInfo string `json:"templateInfo" form:"templateInfo" gorm:"column:template_info;type:text;"` //模板信息
- Limit int `json:"limit" form:"limit" gorm:"column:limit;comment:导出限制"`
+ Limit *int `json:"limit" form:"limit" gorm:"column:limit;comment:导出限制"`
Order string `json:"order" form:"order" gorm:"column:order;comment:排序"`
Conditions []Condition `json:"conditions" form:"conditions" gorm:"foreignKey:TemplateID;references:TemplateID;comment:条件"`
JoinTemplate []JoinTemplate `json:"joinTemplate" form:"joinTemplate" gorm:"foreignKey:TemplateID;references:TemplateID;comment:关联"`
diff --git a/server/service/system/sys_export_template.go b/server/service/system/sys_export_template.go
index 616a5da94..a9dcba1aa 100644
--- a/server/service/system/sys_export_template.go
+++ b/server/service/system/sys_export_template.go
@@ -190,8 +190,8 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID
}
}
// 模板的默认limit
- if limit == "" && template.Limit != 0 {
- db = db.Limit(template.Limit)
+ if limit == "" && *template.Limit != 0 {
+ db = db.Limit(*template.Limit)
}
// 通过参数传入offset
diff --git a/web/src/view/systemTools/exportTemplate/exportTemplate.vue b/web/src/view/systemTools/exportTemplate/exportTemplate.vue
index 94d883e95..234abda4e 100644
--- a/web/src/view/systemTools/exportTemplate/exportTemplate.vue
+++ b/web/src/view/systemTools/exportTemplate/exportTemplate.vue
@@ -119,13 +119,18 @@
-
+
{{ scope.row.dbNname || "GVA库" }}
+
-