Merge branch 'feature/eta_1.9.3' into debug

controllers/data_manage/base_from_ths_hf.go

@@ -299,7 +299,7 @@ func (this *BaseFromThsHfController) List() {
 
 	// 查询所有分类-分类查询/分类完整路径用
 	classifyOb := new(data_manage.BaseFromThsHfClassify)
-	classifies := make([]*data_manage.BaseFromThsHfClassify, 0)
+	//classifies := make([]*data_manage.BaseFromThsHfClassify, 0)
 	classifyIdItem := make(map[int]*data_manage.BaseFromThsHfClassify)
 	{
 		list, e := classifyOb.GetItemsByCondition(``, make([]interface{}, 0), []string{classifyOb.Cols().PrimaryId, classifyOb.Cols().ClassifyName, classifyOb.Cols().ClassifyNameEn, classifyOb.Cols().LevelPath}, "")
@@ -311,7 +311,7 @@ func (this *BaseFromThsHfController) List() {
 		for _, v := range list {
 			classifyIdItem[v.BaseFromThsHfClassifyId] = v
 		}
-		classifies = list
+		//classifies = list
 	}
 
 	// 筛选项
@@ -332,53 +332,63 @@ func (this *BaseFromThsHfController) List() {
 					classifyIds = append(classifyIds, t)
 				}
 			}
-
-			// 不包含子分类
-			if len(classifyIds) > 0 && !params.IncludeChild {
-				cond += fmt.Sprintf(" AND %s IN (%s)", indexOb.Cols().BaseFromThsHfClassifyId, utils.GetOrmInReplace(len(classifyIds)))
-				pars = append(pars, classifyIds)
-			}
-
-			// 包含子分类
-			if len(classifyIds) > 0 && params.IncludeChild {
-				queryClassifyIds := make([]int, 0)
-				queryClassifyExist := make(map[int]bool)
-
-				for _, v := range classifyIds {
-					// 遍历所有分类从LevelPath中找含有查询分类ID的...=_=!
-					for _, cv := range classifies {
-						if queryClassifyExist[cv.BaseFromThsHfClassifyId] {
-							continue
-						}
-						if cv.LevelPath == "" {
-							continue
-						}
-						strArr := strings.Split(cv.LevelPath, ",")
-						if len(strArr) == 0 {
-							continue
-						}
-						for _, sv := range strArr {
-							tv, _ := strconv.Atoi(sv)
-							if tv == v {
-								queryClassifyIds = append(queryClassifyIds, cv.BaseFromThsHfClassifyId)
-								queryClassifyExist[cv.BaseFromThsHfClassifyId] = true
-								break
-							}
-						}
-					}
-				}
-
-				if len(queryClassifyIds) == 0 {
-					page := paging.GetPaging(params.CurrentIndex, params.PageSize, 0)
-					resp.Paging = page
-					br.Ret = 200
-					br.Success = true
-					br.Msg = "获取成功"
-					return
-				}
-				cond += fmt.Sprintf(" AND %s IN (%s)", indexOb.Cols().BaseFromThsHfClassifyId, utils.GetOrmInReplace(len(queryClassifyIds)))
-				pars = append(pars, queryClassifyIds)
+			if len(classifyIds) == 0 {
+				page := paging.GetPaging(params.CurrentIndex, params.PageSize, 0)
+				resp.Paging = page
+				br.Ret = 200
+				br.Success = true
+				br.Msg = "获取成功"
+				return
 			}
+			cond += fmt.Sprintf(" AND %s IN (%s)", indexOb.Cols().BaseFromThsHfClassifyId, utils.GetOrmInReplace(len(classifyIds)))
+			pars = append(pars, classifyIds)
+
+			//// 不包含子分类
+			//if len(classifyIds) > 0 && !params.IncludeChild {
+			//	cond += fmt.Sprintf(" AND %s IN (%s)", indexOb.Cols().BaseFromThsHfClassifyId, utils.GetOrmInReplace(len(classifyIds)))
+			//	pars = append(pars, classifyIds)
+			//}
+			//
+			//// 包含子分类
+			//if len(classifyIds) > 0 && params.IncludeChild {
+			//	queryClassifyIds := make([]int, 0)
+			//	queryClassifyExist := make(map[int]bool)
+			//
+			//	for _, v := range classifyIds {
+			//		// 遍历所有分类从LevelPath中找含有查询分类ID的...=_=!
+			//		for _, cv := range classifies {
+			//			if queryClassifyExist[cv.BaseFromThsHfClassifyId] {
+			//				continue
+			//			}
+			//			if cv.LevelPath == "" {
+			//				continue
+			//			}
+			//			strArr := strings.Split(cv.LevelPath, ",")
+			//			if len(strArr) == 0 {
+			//				continue
+			//			}
+			//			for _, sv := range strArr {
+			//				tv, _ := strconv.Atoi(sv)
+			//				if tv == v {
+			//					queryClassifyIds = append(queryClassifyIds, cv.BaseFromThsHfClassifyId)
+			//					queryClassifyExist[cv.BaseFromThsHfClassifyId] = true
+			//					break
+			//				}
+			//			}
+			//		}
+			//	}
+			//
+			//	if len(queryClassifyIds) == 0 {
+			//		page := paging.GetPaging(params.CurrentIndex, params.PageSize, 0)
+			//		resp.Paging = page
+			//		br.Ret = 200
+			//		br.Success = true
+			//		br.Msg = "获取成功"
+			//		return
+			//	}
+			//	cond += fmt.Sprintf(" AND %s IN (%s)", indexOb.Cols().BaseFromThsHfClassifyId, utils.GetOrmInReplace(len(queryClassifyIds)))
+			//	pars = append(pars, queryClassifyIds)
+			//}
 		}
 
 		if params.Frequency != "" {