fix: 修复主键为空的数据被导出的问题

This commit is contained in:
kercylan98 2023-07-17 20:13:05 +08:00
parent 8bbd49554f
commit ab0a7cbbbc
1 changed files with 10 additions and 8 deletions

View File

@ -104,12 +104,16 @@ func (slf *Xlsx) GetData() [][]pce.DataInfo {
} }
} }
for i, field := range slf.GetFields() { for i, field := range fields {
var isIndex = i-1 < slf.GetIndexCount() var isIndex = i < slf.GetIndexCount()
var value string var value string
if valueCell := slf.get(field.Index, y); valueCell != nil { if valueCell := slf.get(field.Index, y); valueCell != nil {
value = valueCell.String() value = valueCell.String()
if isIndex && len(strings.TrimSpace(value)) == 0 {
stop = true
break
}
} else if isIndex { } else if isIndex {
stop = true stop = true
break break
@ -118,12 +122,10 @@ func (slf *Xlsx) GetData() [][]pce.DataInfo {
if valueCell == nil { if valueCell == nil {
break break
} }
if len(fields) > i-1 { line = append(line, pce.DataInfo{
line = append(line, pce.DataInfo{ DataField: field,
DataField: field, Value: value,
Value: value, })
})
}
} }
if len(line) > 0 { if len(line) > 0 {
data = append(data, line) data = append(data, line)