eta 1.4.4

controllers/data_manage/edb_info.go

@@ -5408,54 +5408,59 @@ func (this *EdbInfoController) SmmExistCheck() {
 
 	if selectAll {
 		// 如果勾了列表全选，那么EdbCode传的就是排除的code
-		var condition string
-		var pars []interface{}
-
-		if types != "" {
-			typeArr := strings.Split(types, ",")
-			for i, v := range typeArr {
-				typeStr := "type_"
-				typeStr += fmt.Sprintf("%d", i+1)
-				condition += " AND " + typeStr + " =? "
-				pars = append(pars, v)
+		if selectCode == "" {
+			// 无勾选code，走查询
+			var condition string
+			var pars []interface{}
+
+			if types != "" {
+				typeArr := strings.Split(types, ",")
+				for i, v := range typeArr {
+					typeStr := "type_"
+					typeStr += fmt.Sprintf("%d", i+1)
+					condition += " AND " + typeStr + " =? "
+					pars = append(pars, v)
+				}
 			}
-		}
 
-		if dataState != "" {
-			if dataState == "normal" {
-				condition += " AND (data_state = 'normal' OR data_state = '') "
-				pars = append(pars)
-			} else {
-				condition += " AND data_state = ? "
-				pars = append(pars, dataState)
+			if dataState != "" {
+				if dataState == "normal" {
+					condition += " AND (data_state = 'normal' OR data_state = '') "
+					pars = append(pars)
+				} else {
+					condition += " AND data_state = ? "
+					pars = append(pars, dataState)
+				}
 			}
-		}
 
+			if frequency != "" {
+				condition += " AND frequency = ? "
+				pars = append(pars, frequency)
+			}
 
-		if frequency != "" {
-			condition += " AND frequency = ? "
-			pars = append(pars, frequency)
-		}
-
-		indexList, err := data_manage.GetSmmIndexDataListNoPage(condition, pars)
-		if err != nil {
-			br.Msg = "获取指标列表失败"
-			br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
-			return
-		}
+			indexList, err := data_manage.GetSmmIndexDataListNoPage(condition, pars)
+			if err != nil {
+				br.Msg = "获取指标列表失败"
+				br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
+				return
+			}
 
-		for _, v := range indexList {
-			codeArr = append(codeArr, v.IndexCode)
-		}
+			for _, v := range indexList {
+				codeArr = append(codeArr, v.IndexCode)
+			}
 
-		noUseCodeArr := strings.Split(edbCode, ",")
+			noUseCodeArr := strings.Split(edbCode, ",")
 
-		for _, code := range codeArr {
-			// 检查code是否在noUseCodeArr数组中
-			if !utils.ArrContainsStr(noUseCodeArr, code) {
-				// 如果不在，将其添加到结果数组中
-				edbCodeArr = append(edbCodeArr, code)
+			for _, code := range codeArr {
+				// 检查code是否在noUseCodeArr数组中
+				if !utils.ArrContainsStr(noUseCodeArr, code) {
+					// 如果不在，将其添加到结果数组中
+					edbCodeArr = append(edbCodeArr, code)
+				}
 			}
+		} else {
+			// 有勾选，不查询
+			edbCodeArr = strings.Split(selectCode, ",")
 		}
 	} else {
 		//未勾选全选EdbCode就是需要的code