Merge branch 'ETA_2.3.0' into debug

controllers/data_manage/edb_classify.go

@@ -1260,7 +1260,6 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	classifyIdsStr := this.GetString("ClassifyIds")
 	classifyIds := strings.Split(classifyIdsStr, ",")
 
-
 	var condition string
 	var pars []interface{}
 
@@ -1307,6 +1306,8 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 			condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(finalClassifyIds)) + ") "
 			pars = append(pars, finalClassifyIds)
 		}
+	} else {
+		condition += " AND 1=2 "
 	}
 	if keyWord != "" {
 		keyWordArr := strings.Split(keyWord, " ")
@@ -1371,7 +1372,6 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 		return
 	}
 
-
 	resp := new(data_manage.EdbInfoFilterDataResp)
 	resp.List = list
 	resp.Paging = page
@@ -1379,4 +1379,4 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}