Merge pull request #5843 from chalice-1831/v3.9.x_import_check_assoca…

…tion bugfix 修复导入主机判断excel表格数量问题以及导入关联关系返回错误不正确问题
TencentBlueKing · Dec 21, 2021 · 93ee211 · 93ee211
2 parents f9f91cc + 0744f5c
commit 93ee211
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/scene_server/topo_server/core/operation/import_association.go b/src/scene_server/topo_server/core/operation/import_association.go
@@ -30,10 +30,14 @@ import (
 	"configcenter/src/common/util"
 )
 
-func (assoc *association) ImportInstAssociation(ctx context.Context, kit *rest.Kit, objID string, importData map[int]metadata.ExcelAssociation, languageIf language.CCLanguageIf) (resp metadata.ResponeImportAssociationData, err error) {
-	ia := NewImportAssociation(ctx, assoc, kit, objID, importData, assoc.authManager, languageIf.CreateDefaultCCLanguageIf(util.GetLanguage(kit.Header)))
-	err = ia.ParsePrimaryKey()
-	if err != nil {
+// ImportInstAssociation import inst association
+func (assoc *association) ImportInstAssociation(ctx context.Context, kit *rest.Kit, objID string,
+	importData map[int]metadata.ExcelAssociation, languageIf language.CCLanguageIf) (
+	resp metadata.ResponeImportAssociationData, err error) {
+
+	ia := NewImportAssociation(ctx, assoc, kit, objID, importData, assoc.authManager,
+		languageIf.CreateDefaultCCLanguageIf(util.GetLanguage(kit.Header)))
+	if err = ia.ParsePrimaryKey(); err != nil {
 		return resp, err
 	}
 

diff --git a/src/scene_server/topo_server/service/object_association.go b/src/scene_server/topo_server/service/object_association.go
@@ -192,7 +192,7 @@ func (s *Service) ImportInstanceAssociation(ctx *rest.Contexts) {
 	})
 
 	if txnErr != nil {
-		ctx.RespAutoError(txnErr)
+		ctx.RespEntityWithError(ret, txnErr)
 		return
 	}
 	ctx.RespEntity(ret)

diff --git a/src/web_server/logics/host.go b/src/web_server/logics/host.go
@@ -219,12 +219,12 @@ func (lgc *Logics) ImportHosts(ctx context.Context, f *xlsx.File, header http.He
 		resp = result
 	}
 
-	if len(f.Sheets) < 2 {
+	if len(f.Sheets) <= 2 {
 		resp.Result = true
 		return resp
 	}
 
-	// if len(f.Sheets) >= 2, the second sheet is association data to be import
+	// if len(f.Sheets) > 2, the second sheet is association data to be import
 	asstInfoMap, assoErrMsg := GetAssociationExcelData(f.Sheets[1], common.HostAddMethodExcelAssociationIndexOffset,
 		defLang)