Merge branch 'bugfix_3745' into debug

models/data_manage/edb_data_insert_config.go

@@ -144,14 +144,6 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 				return
 			}
 			err = nil
-
-			sql = `SELECT data_time FROM %s WHERE edb_info_id=? ORDER BY data_time DESC LIMIT 1 OFFSET 1`
-			sql = fmt.Sprintf(sql, tableName)
-			err = to.Raw(sql, edbInfo.EdbInfoId).QueryRow(&offsetDate)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return
-			}
-			err = nil
 		}
 
 		// 如果是没有历史数据，那么就需要增加数据
@@ -161,6 +153,15 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 			_, err = to.Raw(addSql).Exec()
 		} else if value == "" {
 			// 传空值时删除
+			sql := `SELECT data_time FROM %s WHERE edb_info_id=? ORDER BY data_time DESC LIMIT 1 OFFSET 1`
+			sql = fmt.Sprintf(sql, tableName)
+			err = to.Raw(sql, edbInfo.EdbInfoId).QueryRow(&offsetDate)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				return
+			}
+
+			dateStr = offsetDate
+
 			deleteSql := `DELETE FROM %s WHERE edb_data_id = %d;`
 			deleteSql = fmt.Sprintf(deleteSql, tableName, edbDateData.EdbDataId)
 			_, err = to.Raw(deleteSql).Exec()
@@ -174,10 +175,6 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 		}
 	}
 
-	// 更改指标的数据结束日期
-	if value == "" {
-		dateStr = offsetDate
-	}
 	edbInfo.EndDate = dateStr
 	_, err = to.Update(edbInfo, "EndDate")