|
@@ -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 {
|
|
@@ -612,7 +615,7 @@ func (this *MobileHomeController) NewList() {
|
|
|
br.ErrMsg = "获取数据总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- //return
|
|
|
+ return
|
|
|
if user.CompanyId <= 1 {
|
|
|
total = utils.PageSize5
|
|
|
}
|