feature:增加API导入导出,方便填写录入,暂时屏蔽自动书写导入的创建时间的功能,等待gorm合并pr后恢复。
This commit is contained in:
@@ -107,7 +107,7 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
|
||||
|
||||
err = db.Order(OrderStr).Find(&apiList).Error
|
||||
} else {
|
||||
err = db.Order("api_group").Find(&apiList).Error
|
||||
err = db.Order("id desc").Find(&apiList).Error
|
||||
}
|
||||
}
|
||||
return apiList, total, err
|
||||
|
@@ -15,7 +15,6 @@ import (
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type SysExportTemplateService struct {
|
||||
@@ -316,14 +315,17 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID
|
||||
key := titleKeyMap[excelTitle[ii]]
|
||||
item[key] = value
|
||||
}
|
||||
needCreated := tx.Migrator().HasColumn(template.TableName, "created_at")
|
||||
needUpdated := tx.Migrator().HasColumn(template.TableName, "updated_at")
|
||||
if item["created_at"] == nil && needCreated {
|
||||
item["created_at"] = time.Now()
|
||||
}
|
||||
if item["updated_at"] == nil && needUpdated {
|
||||
item["updated_at"] = time.Now()
|
||||
}
|
||||
|
||||
// 此处需要等待gorm修复HasColumn中的painc问题
|
||||
//needCreated := tx.Migrator().HasColumn(template.TableName, "created_at")
|
||||
//needUpdated := tx.Migrator().HasColumn(template.TableName, "updated_at")
|
||||
//
|
||||
//if item["created_at"] == nil && needCreated {
|
||||
// item["created_at"] = time.Now()
|
||||
//}
|
||||
//if item["updated_at"] == nil && needUpdated {
|
||||
// item["updated_at"] = time.Now()
|
||||
//}
|
||||
|
||||
cErr := tx.Table(template.TableName).Create(&item).Error
|
||||
if cErr != nil {
|
||||
|
Reference in New Issue
Block a user