xingzai 1 gadu atpakaļ
vecāks
revīzija
abaafb6257
1 mainītis faili ar 6 papildinājumiem un 4 dzēšanām
  1. 6 4
      controllers/home.go

+ 6 - 4
controllers/home.go

@@ -839,15 +839,17 @@ func (this *HomeController) NewList() {
 			return
 		}
 		conditionInit += conditionTagIdsInit
-	} else {
-		//查询近一个月的数据
-		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
 	}
-
+	//行业筛选
 	if chartPermissionId > 0 {
 		conditionInit += " AND chart_permission_id  =  " + strconv.Itoa(chartPermissionId)
 	}
 
+	if tagIds == "" && chartPermissionId == 0 {
+		//查询近一个月的数据
+		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
+	}
+
 	//conditionInit += `  AND source IN ('newchart')`
 	if user.CompanyId <= 1 || totalRai == 0 {
 		//condition += " AND source IN ('roadshow','article') "