rdluck 4 years ago
parent
commit
d1d417a3ff
1 changed files with 22 additions and 26 deletions
  1. 22 26
      controllers/home.go

+ 22 - 26
controllers/home.go

@@ -39,36 +39,32 @@ func (this *HomeController) ListHome() {
 
 	var condition string
 	var pars []interface{}
-
-	if chartPermissionId <= 0 {
-		br.Msg = "参数错误"
-		br.Msg = "参数错误,chartPermissionId"
-		return
-	}
-
-	categoryId, err := models.GetCategoryId(chartPermissionId)
-
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取分类权限信息失败,Err:" + err.Error()
-		return
-	}
 	var total int
-	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(models.HomeListResp)
-	if categoryId == "" {
-		list := make([]*models.HomeArticle, 0)
-		resp.List = list
-		resp.Paging = page
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
+	page := paging.GetPaging(currentIndex, pageSize, total)
+
+	if chartPermissionId > 0 {
+		categoryId, err := models.GetCategoryId(chartPermissionId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取分类权限信息失败,Err:" + err.Error()
+			return
+		}
+		page = paging.GetPaging(currentIndex, pageSize, total)
+		if categoryId == "" {
+			list := make([]*models.HomeArticle, 0)
+			resp.List = list
+			resp.Paging = page
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "获取成功"
+			br.Data = resp
+			return
+		}
+		condition = ` AND category_id IN(` + categoryId + `)`
 	}
-	condition = ` AND category_id IN(` + categoryId + `)`
 
-	total, err = models.GetHomeCount(condition, pars)
+	total, err := models.GetHomeCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.Msg = "获取帖子总数失败,Err:" + err.Error()