estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed: 导出模板调整limit为指针

Browse Source
This commit is contained in:
pixelMax(奇淼
2024-06-27 14:57:01 +08:00
parent bb4e938bd2
commit e9be009f49
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/model/system/sys_export_template.go
View File

@@ -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:关联"`

4
server/service/system/sys_export_template.go
View File

@@ -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