zwxi 1 year ago
parent
commit
042d009f19
1 changed files with 28 additions and 19 deletions
  1. 28 19
      controllers/data_manage/edb_info.go

+ 28 - 19
controllers/data_manage/edb_info.go

@@ -5444,7 +5444,17 @@ func (this *EdbInfoController) SmmExistCheck() {
 			}
 		} else {
 			// 有勾选,不查询
-			edbCodeArr = strings.Split(selectCode, ",")
+			codeArr = strings.Split(selectCode, ",")
+
+			noUseCodeArr := strings.Split(edbCode, ",")
+
+			for _, code := range codeArr {
+				// 检查code是否在noUseCodeArr数组中
+				if !utils.ArrContainsStr(noUseCodeArr, code) {
+					// 如果不在,将其添加到结果数组中
+					edbCodeArr = append(edbCodeArr, code)
+				}
+			}
 		}
 	} else {
 		//未勾选全选EdbCode就是需要的code
@@ -5618,24 +5628,23 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 
 	resp := new(data_manage.EdbInfoSearchResp)
 
-	//todo
-	//respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode)
-	//if err != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取失败,Err:" + err.Error()
-	//	return
-	//}
-	//if respItem.Ret != 200 {
-	//	if respItem.Ret == 421 {
-	//		br.Msg = "该渠道已超过添加上限"
-	//	} else if respItem.Ret == 4052 {
-	//		br.Msg = "该指标已下架"
-	//	} else {
-	//		br.Msg = "未搜索到该指标"
-	//	}
-	//	br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-	//	return
-	//}
+	respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	if respItem.Ret != 200 {
+		if respItem.Ret == 421 {
+			br.Msg = "该渠道已超过添加上限"
+		} else if respItem.Ret == 4052 {
+			br.Msg = "该指标已下架"
+		} else {
+			br.Msg = "未搜索到该指标"
+		}
+		br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
+		return
+	}
 
 	edbCodeStr := ""
 	for i, _ := range edbCodeArr {