活动列表排序优化

controllers/activity.go

@@ -263,7 +263,12 @@ func (this *ActivityCoAntroller) ActivityList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	condition += ` ORDER BY art.active_state ASC, art.activity_time ASC  `
+	if activeState == "2" || activeState == "3" {
+		condition += ` ORDER BY art.activity_time DESC  `
+	} else {
+		condition += ` ORDER BY art.active_state ASC, art.activity_time ASC  `
+	}
+
 	list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"

controllers/home.go

@@ -50,6 +50,13 @@ func (this *HomeController) ListHome() {
 	var total int
 	resp := new(models.HomeListResp)
 	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.HaveResearch = true
+	userType, _, err := services.GetUserType(user.CompanyId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
+		return
+	}
 	condition += ` AND is_summary = 1  `
 	if chartPermissionId > 0 {
 		categoryId, err := models.GetCategoryId(chartPermissionId)
@@ -64,13 +71,8 @@ func (this *HomeController) ListHome() {
 			br.ErrMsg = "获取信息失败,Err:" + err.Error()
 			return
 		}
-		userType, _, err := services.GetUserType(user.CompanyId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
-			return
-		}
 		if userType == 1 && categoryinfo.PermissionName == "研选" {
+			resp.HaveResearch = false
 			resp.Paging = page
 			br.Ret = 200
 			br.Success = true
@@ -78,7 +80,6 @@ func (this *HomeController) ListHome() {
 			br.Data = resp
 			return
 		}
-		resp.HaveResearch = true
 		page = paging.GetPaging(currentIndex, pageSize, total)
 		if categoryId != "" {
 			condition += ` AND category_id IN(` + categoryId + `)`
@@ -86,10 +87,13 @@ func (this *HomeController) ListHome() {
 		} else {
 			condition += ` AND  category_name   LIKE '%` + categoryinfo.PermissionName + `%'`
 		}
-
+	}
+	//永续客户无法查看研选分类的内容
+	if userType == 1 {
+		condition += ` AND  category_name  NOT LIKE '%研选` + `%'`
 	}
 	//condition = ` AND a.category_id NOT IN (85,71) `
-	total, err := models.GetHomeCount(condition, pars)
+	total, err = models.GetHomeCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.Msg = "获取帖子总数失败，Err:" + err.Error()