Merge branch 'cygx_12.4.1' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/home.go

@@ -506,13 +506,16 @@ func (this *MobileHomeController) 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) + "'"
+	}
 	//return
 	//conditionInit += `  AND source IN ('newchart')`
 	if user.CompanyId <= 1 {