Browse Source

no message

xingzai 2 years ago
parent
commit
d866df793e
1 changed files with 20 additions and 16 deletions
  1. 20 16
      controllers/report.go

+ 20 - 16
controllers/report.go

@@ -52,7 +52,7 @@ func (this *MobileReportController) TradeList() {
 	var err error
 	mapCategory := make(map[int]int)
 	if ChartPermissionId == utils.CE_LUE_ID {
-		listTrade, errTrade := models.GetReportMappingStrategyHomeAll(user.UserId)
+		listTrade, errTrade := models.GetReportMappingStrategyHomeAll()
 		list = listTrade
 		err = errTrade
 
@@ -81,24 +81,22 @@ func (this *MobileReportController) TradeList() {
 	}
 
 	for k, v := range list {
-		count, err := models.GetUserIsReadThisNewCategoryArticleCount(v.CategoryId, uid)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		Newdetail, err := models.GetNewArticleByCategoryId(v.CategoryId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败,Err:" + err.Error()
-			return
-		}
-		if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
-			list[k].IsRed = true
-		}
+
 		var condition string
 		var pars []interface{}
 
+		//categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(v.CategoryId)
+		//if errCategory != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在:" + strconv.Itoa(v.CategoryId)
+		//	return
+		//}
+		//if categoryIdSet != "" {
+		//	condition = ` AND a.category_id IN(` + categoryIdSet + `)`
+		//} else {
+		//	condition = ` AND a.category_id IN(` + strconv.Itoa(v.CategoryId) + `)`
+		//}
+
 		if v.PolymerizationId != "" {
 			condition = ` AND a.category_id IN(` + v.PolymerizationId + `)`
 		} else {
@@ -107,6 +105,12 @@ func (this *MobileReportController) TradeList() {
 
 		if ChartPermissionId != utils.CE_LUE_ID {
 			var pageSize int
+			//if ChartPermissionId == utils.KE_JI_ID {
+			//	pageSize = 12
+			//} else {
+			//	pageSize = 3
+			//}
+
 			pageSize = 3
 			listArticle, err := models.GetHomeList(condition, pars, 0, pageSize)
 			if err != nil {