fix(meter):修复批量导入表计时的SQL语句和数据处理行为。

This commit is contained in:
徐涛
2023-06-27 14:22:43 +08:00
parent a626869f14
commit a1a72b7204
3 changed files with 4 additions and 4 deletions

View File

@@ -155,7 +155,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
// 步骤2.1:获取表计档案中出现的所有建筑,并对档案中新出现的建筑进行创建操作
unexistsBuildingNames := make([]string, 0)
for _, record := range records {
if !lo.Contains(buildingNames, *record.Building) {
if record.Building != nil && !lo.Contains(buildingNames, *record.Building) {
unexistsBuildingNames = append(unexistsBuildingNames, *record.Building)
}
}
@@ -186,7 +186,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
// 步骤2.3检测并替换表计档案中的建筑ID
for _, record := range records {
for _, building := range buildings {
if building.Name == *record.Building {
if record.Building != nil && building.Name == *record.Building {
record.Building = &building.Id
break
}