Merge branch 'feature/eta_forum3_chart_classify' into debug

controllers/data_manage/chart_classify.go

@@ -541,7 +541,7 @@ func (this *ChartClassifyController) DeleteChartClassifyCheck() {
 		tipsMsg = "可删除，进行删除操作"
 	}
 
-	if req.ChartClassifyId == 0 && req.ChartInfoId > 0 {
+	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
 			if utils.IsErrNoRow(err) {

services/eta_forum/eta_forum_hub.go

@@ -726,7 +726,7 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 
 	// 批量上传已经上架的分类下的图表到资源库中
 	// 查询需要新增的图表ID
-	condition = " and source=1 and forum_chart_info_id=0 and chart_classify_id in ?"
+	condition = " and source=1 and forum_chart_info_id=0 and resource_status !=2 and chart_classify_id in ?"
 	total, err = data_manage.GetChartInfoCountByCondition(condition, []interface{}{upChartClassifyIdList})
 	if err != nil {
 		return