zwxi 1 年之前
父節點
當前提交
8c4179fdd6
共有 2 個文件被更改,包括 6 次插入10 次删除
  1. 5 10
      controllers/data_manage/edb_info.go
  2. 1 0
      controllers/data_manage/smm_api.go

+ 5 - 10
controllers/data_manage/edb_info.go

@@ -5377,17 +5377,11 @@ func (this *EdbInfoController) SmmExistCheck() {
 	types := this.GetString("Types")
 	frequency := this.GetString("Frequency")
 	dataState := this.GetString("DataState")
-	keyword := this.GetString("Keyword")
 	edbCode := this.GetString("EdbCode")
 	edbCode = strings.Trim(edbCode, "\t")
 	edbCode = strings.Trim(edbCode, " ")
 	edbCode = strings.Replace(edbCode, "\t", "", -1)
 
-	if edbCode == "" {
-		br.Msg = "请输入指标ID"
-		return
-	}
-
 	var edbCodeArr []string
 
 	if selectAll {
@@ -5414,10 +5408,6 @@ func (this *EdbInfoController) SmmExistCheck() {
 			}
 		}
 
-		if keyword != "" {
-			condition += " AND (index_name LIKE ? OR index_code LIKE ?) "
-			pars = utils.GetLikeKeywordPars(pars, keyword, 2)
-		}
 
 		if frequency != "" {
 			condition += " AND frequency = ? "
@@ -5446,6 +5436,11 @@ func (this *EdbInfoController) SmmExistCheck() {
 		return
 	}
 
+	if len(edbCodeArr) <= 0 {
+		br.Msg = "无符合指标或指标代码错误"
+		return
+	}
+
 	indexList, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_YS, edbCodeArr)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "校验指标是否存在失败"

+ 1 - 0
controllers/data_manage/smm_api.go

@@ -85,6 +85,7 @@ func (this *EdbInfoController) SmmApiList() {
 		for _, v := range indexCodeArr {
 			indexCodeStr += "'" + v + "',"
 		}
+		indexCodeStr = strings.TrimRight(indexCodeStr, ",")
 		condition += " AND index_code IN (" + indexCodeStr + ") "
 	}