Merge branch 'cygx/cygx_14.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -219,10 +219,7 @@ func (this *ReportController) IndustryList() {
 			industrialUninterested = append(industrialUninterested, strconv.Itoa(k))
 		}
 	}
-	//如果不感兴趣有值，而且展开按钮没有展开，就放出展开按钮
-	if len(industrialUninterested) > 0 && isOpen == 0 {
-		resp.IsShowOpen = true
-	}
+
 	industrialUninterested = append(industrialUninterested, "0")
 	//是否展开,展开部分仅展示，不感兴趣的
 	if isOpen == 0 {
@@ -294,6 +291,10 @@ func (this *ReportController) IndustryList() {
 	}
 	resp.List = list
 	resp.Paging = page
+	//如果不感兴趣有值，而且展开按钮没有展开，就放出展开按钮
+	if len(industrialUninterested) > 0 && isOpen == 0 && page.IsEnd {
+		resp.IsShowOpen = true
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"