Merge branch 'feature/eta2.3.4_business_user' into debug

# Conflicts:
#	services/eta_forum/eta_forum_hub_lib.go

services/chart_info.go

@@ -382,8 +382,13 @@ func ChartInfoSaveBatch() (err error) {
 	pageSize := 100
 	success := 0
 
+	// 计算需要分多少页
+	pageNum := total / pageSize
+	if total % pageSize != 0 {
+		pageNum += 1
+	}
 	// 循环更新100个图表数据
-	for i := 0; offset < total; i++ {
+	for i := 0; i < pageNum; i++ {
 		// 查询需要更新的图表信息
 		chartInfos, e := models.GetChartInfoListByCondition(condition, []interface{}{chartClassifyIdList}, offset, pageSize)
 		if e != nil {
@@ -407,8 +412,6 @@ func ChartInfoSaveBatch() (err error) {
 			}
 			success += 1
 		}
-
-		offset += pageSize
 	}
 	utils.FileLog.Info("上传图表数据完成, 上传图表数据总数:", success)