Browse Source

指标名称重复

xyxie 1 month ago
parent
commit
ecb6134842

+ 1 - 1
models/data_manage/base_from_usda_fas_classify.go

@@ -80,7 +80,7 @@ type BaseFromUsdaFasClassifyItems struct {
 	ParentId               int    `description:"父级id"`
 	Level                  int    `description:"层级"`
 	Sort                   int    `description:"排序字段,越小越靠前,默认值:10"`
-	Children               []*BaseFromUsdaFasClassifyItems
+	Children               []*BaseFromUsdaFasClassifyItems `description:"子级" gorm:"-"`
 }
 
 type BaseFromUsdaFasClassifyNameItems struct {

+ 1 - 1
services/residual_analysis_service/residual_analysis_service.go

@@ -763,7 +763,7 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 			return fmt.Errorf("删除指标数据失败")
 		}
 	} else {
-		if edbInfoByCondition != nil {
+		if edbInfoByCondition != nil && edbInfoByCondition.EdbInfoId > 0 {
 			return fmt.Errorf("指标名称重复")
 		}