Skip to content

Commit 125006f

Browse files
committed
fix:时间范围修改接受参数
1 parent 8c2e71b commit 125006f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

server/utils/autocode/template_funcs.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ func GenerateSearchConditions(fields []*systemReq.AutoCodeField) string {
137137
} else if field.FieldSearchType == "BETWEEN" || field.FieldSearchType == "NOT BETWEEN" {
138138
if field.FieldType == "time.Time" {
139139
condition = fmt.Sprintf(`
140-
if info.%sRange != nil && len(info.%sRange) == 2 {
141-
db = db.Where("%s %s ? AND ? ", info.%sRange[0], info.%sRange[1])
142-
}`,
140+
if len(info.%sRange) == 2 {
141+
db = db.Where("%s %s ? AND ? ", info.%sRange[0], info.%sRange[1])
142+
}`,
143143
field.FieldName, field.FieldName, field.ColumnName, field.FieldSearchType, field.FieldName, field.FieldName)
144144
} else {
145145
condition = fmt.Sprintf(`
@@ -677,7 +677,7 @@ func GenerateSearchField(field systemReq.AutoCodeField) string {
677677
// 生成范围搜索字段
678678
// time 的情况
679679
if field.FieldType == "time.Time" {
680-
result = fmt.Sprintf("%sRange []string `json:\"%sRange\" form:\"%sRange[]\"`",
680+
result = fmt.Sprintf("%sRange []time.Time `json:\"%sRange\" form:\"%sRange[]\"`",
681681
field.FieldName, field.FieldJson, field.FieldJson)
682682
} else {
683683
startField := fmt.Sprintf("Start%s *%s `json:\"start%s\" form:\"start%s\"`",

0 commit comments

Comments
 (0)