xingzai 1 gadu atpakaļ
vecāks
revīzija
ce4d8be22f
1 mainītis faili ar 11 papildinājumiem un 11 dzēšanām
  1. 11 11
      controllers/report.go

+ 11 - 11
controllers/report.go

@@ -268,13 +268,13 @@ func (this *MobileReportController) IndustryList() {
 
 	if isBillboard {
 		// 查询有已归类行业报告的行业IDs
-		//activeIndustryIds, e := models.GetActiveArticleIndustryIds()
-		//if e != nil {
-		//	br.Msg = "获取失败"
-		//	br.ErrMsg = "获取已归类行业失败, Err:" + e.Error()
-		//	return
-		//}
-		//activeIndustryLen := len(activeIndustryIds)
+		activeIndustryIds, e := models.GetActiveArticleIndustryIds()
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取已归类行业失败, Err:" + e.Error()
+			return
+		}
+		activeIndustryLen := len(activeIndustryIds)
 		//topNum := pageSize
 		condition = ""
 		var parsBd []interface{}
@@ -282,10 +282,10 @@ func (this *MobileReportController) IndustryList() {
 			condition += ` 	AND man.chart_permission_id = ?  `
 			parsBd = append(parsBd, ChartPermissionId)
 		}
-		//if activeIndustryLen > 0 {
-		//	condition += ` AND man.industrial_management_id IN (` + utils.GetOrmInReplace(activeIndustryLen) + `)`
-		//	parsBd = append(parsBd, activeIndustryIds)
-		//}
+		if activeIndustryLen > 0 {
+			condition += ` AND man.industrial_management_id IN (` + utils.GetOrmInReplace(activeIndustryLen) + `)`
+			parsBd = append(parsBd, activeIndustryIds)
+		}
 		//nowTime := time.Now().Local()
 		//startTime := nowTime.AddDate(0, -1, 0)
 		//endTime := nowTime.AddDate(0, 0, -1)