xyxie hace 1 año
padre
commit
2db731c73f
Se han modificado 1 ficheros con 29 adiciones y 16 borrados
  1. 29 16
      controllers/english_report/english_video.go

+ 29 - 16
controllers/english_report/english_video.go

@@ -314,30 +314,44 @@ func (this *EnglishVideoController) List() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	list, err := models.GetEnglishVideoList(condition, pars, startSize, pageSize)
+	list := make([]*models.EnglishVideoList, 0)
+	list, err = models.GetEnglishVideoList(condition, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(models.EnglishVideoListResp)
+	if len(list) == 0 {
+		list = make([]*models.EnglishVideoList, 0)
+		resp.Paging = page
+		resp.List = list
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+	}
 	// 查询分类信息
 	var classifyIdSecondSlice []int
+	classifyNameMap := make(map[int]string)
 	for _, item := range list {
 		classifyIdSecondSlice = append(classifyIdSecondSlice, item.ClassifyIdSecond)
 	}
-	nameList, err := models.GetEnglishClassifyFullNameByIds(classifyIdSecondSlice)
-	if err != nil {
-		br.Msg = "获取分类名称失败"
-		br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
-		return
-	}
-	classifyNameMap := make(map[int]string)
-	for _, v := range nameList {
-		if v.RootId == 0 {
-			classifyNameMap[v.Id] = strings.Join([]string{v.ParentName, v.ClassifyName}, "/")
-		} else {
-			classifyNameMap[v.Id] = strings.Join([]string{v.RootName, v.ParentName, v.ClassifyName}, "/")
+	if len(classifyIdSecondSlice) > 0 {
+		nameList, err := models.GetEnglishClassifyFullNameByIds(classifyIdSecondSlice)
+		if err != nil {
+			br.Msg = "获取分类名称失败"
+			br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
+			return
+		}
+
+		for _, v := range nameList {
+			if v.RootId == 0 {
+				classifyNameMap[v.Id] = strings.Join([]string{v.ParentName, v.ClassifyName}, "/")
+			} else {
+				classifyNameMap[v.Id] = strings.Join([]string{v.RootName, v.ParentName, v.ClassifyName}, "/")
+			}
 		}
 	}
 
@@ -397,8 +411,7 @@ func (this *EnglishVideoController) List() {
 			item.FullClassifyName = n
 		}
 	}
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.EnglishVideoListResp)
+
 	resp.Paging = page
 	resp.List = list
 	br.Ret = 200