fix bug

models/data_manage/edb_info.go

@@ -160,7 +160,7 @@ type AddEdbInfoReq struct {
 	EndDate    string `description:"终止日期"`
 }
 
-func DeleteEdbInfoAndData(edbInfoId, source int) (err error) {
+func DeleteEdbInfoAndData(edbInfoId, source, subSource int) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
@@ -181,8 +181,16 @@ func DeleteEdbInfoAndData(edbInfoId, source int) (err error) {
 		return
 	}
 
-	// 删除指标数据
-	tableName := GetEdbDataTableName(source)
+	var tableName string
+	if subSource == 0 {
+		// 删除指标数据
+		tableName = GetEdbDataTableName(source)
+	} else {
+		if source == utils.DATA_SOURCE_WIND {
+			tableName = "edb_data_wind_wsd"
+		}
+	}
+
 	if tableName != "" {
 		sql = ` DELETE FROM %s WHERE edb_info_id=? `
 		sql = fmt.Sprintf(sql, tableName)

services/data/edb_classify.go

@@ -583,7 +583,7 @@ func Delete(classifyId, edbInfoId int, sysUser *system.Admin, requestBody, reque
 		}
 
 		//真实删除
-		tmpErr = data_manage.DeleteEdbInfoAndData(edbInfo.EdbInfoId, edbInfo.Source)
+		tmpErr = data_manage.DeleteEdbInfoAndData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.SubSource)
 		if tmpErr != nil {
 			errMsg = "删除失败"
 			err = errors.New("删除失败，Err:" + tmpErr.Error())