Merge branch 'feature/eta_forum3_chart_classify' into debug

services/eta_forum/eta_forum_hub.go

@@ -742,13 +742,16 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 		success := 0
 
 		// 循环更新100个图表数据
-		for i := 0; offset < total; i++ {
+		for i := 0; offset <= total; i++ {
 			// 查询需要更新的图表信息
 			chartInfos, e := data_manage.GetChartInfoListByCondition(condition, []interface{}{chartClassifyIdList}, offset, pageSize)
 			if e != nil {
 				err = fmt.Errorf("查询需要更新的图表信息失败: %v", e)
 				return
 			}
+			if len(chartInfos) == 0 {
+				break
+			}
 			// 循环更新图表数据
 			for _, chartInfo := range chartInfos {
 				// 更新图表数据
@@ -761,7 +764,7 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 				success += 1
 			}
 
-			offset = (i + 1) * pageSize
+			offset += pageSize
 		}
 		utils.FileLog.Info("更新图表数据完成, 更新图表数据总数:", success)
 	}
@@ -779,12 +782,15 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 	offset := 0
 	pageSize := 100
 	success := 0
-	for i := 0; offset < total; i++ {
+	for i := 0; offset <= total; i++ {
 		chartInfos, e := data_manage.GetChartInfoListByCondition(condition, []interface{}{upChartClassifyIdList}, offset, pageSize)
 		if e != nil {
 			err = fmt.Errorf("查询需要新增的图表信息失败: %v", e)
 			return
 		}
+		if len(chartInfos) == 0 {
+			break
+		}
 		// 循环更新图表数据
 		for _, chartInfo := range chartInfos {
 			// 更新图表数据
@@ -797,7 +803,7 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 			success += 1
 		}
 
-		offset = (i + 1) * pageSize
+		offset += pageSize
 	}
 	utils.FileLog.Info("批量上传已经上架的分类下的图表到资源库中完成, 新增图表数据总数:", success)
 	// 更新指标数据
@@ -863,13 +869,16 @@ func ChartInfoDeleteBatch(chartClassifyInfo *data_manage.ChartClassify, sysUser
 	success := 0
 
 	// 循环更新100个图表数据
-	for i := 0; offset < total; i++ {
+	for i := 0; offset <= total; i++ {
 		// 查询需要更新的图表信息
 		chartInfos, e := data_manage.GetChartInfoListByCondition(condition, []interface{}{chartClassifyInfo.Source, chartClassifyIdList}, offset, pageSize)
 		if e != nil {
 			err = fmt.Errorf("查询需要更新的图表信息失败: %v", e)
 			return
 		}
+		if len(chartInfos) == 0 {
+			break
+		}
 		// 循环更新图表数据
 		for _, chartInfo := range chartInfos {
 			// 删除图表数据
@@ -882,7 +891,7 @@ func ChartInfoDeleteBatch(chartClassifyInfo *data_manage.ChartClassify, sysUser
 			success += 1
 		}
 
-		offset = (i + 1) * pageSize
+		offset += pageSize
 	}
 	fmt.Println("删除图表数据完成, 删除图表数据总数:", success)
 	return