瀏覽代碼

增加精选标识

xyxie 2 月之前
父節點
當前提交
efa0d1a0f5
共有 3 個文件被更改,包括 21 次插入20 次删除
  1. 0 3
      controllers/data_manage/chart_classify.go
  2. 4 2
      models/data_manage/chart_classify.go
  3. 17 15
      services/data/chart_classify.go

+ 0 - 3
controllers/data_manage/chart_classify.go

@@ -1113,9 +1113,6 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 	var allNodes []*data_manage.ChartClassifyItems
 	// 获取是否精选资源标识
 	isSelected, _ := this.GetInt("IsSelected")
-	if isSelected == utils.ChartClassifyIsSelected {
-		
-	}
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
 		allChartInfo, err := data_manage.GetChartClassifyAndInfoByParentIdForMe(chartClassifyId, sysUser.AdminId, isSelected)

+ 4 - 2
models/data_manage/chart_classify.go

@@ -643,7 +643,8 @@ SELECT
 	chart_type,
 	calendar,
 	season_start_date,
-	season_end_date
+	season_end_date,
+	0 as is_selected
 FROM
 	chart_info 
 WHERE
@@ -691,7 +692,8 @@ SELECT
 	sys_user_real_name,
 	sort,
 	0 AS level,
-	unique_code
+	unique_code,
+	0 as is_selected
 FROM
 	chart_info 
 WHERE

+ 17 - 15
services/data/chart_classify.go

@@ -812,7 +812,7 @@ func moveChartClassify(parentChartClassifyInfo, chartClassifyInfo, prevClassify,
 					err = errors.New("更新子目录精选标识失败,Err:" + err.Error())
 					return
 				}
-				go eta_forum.ChartClassifySaveBatch(chartClassifyInfo.ChartClassifyId)
+				go eta_forum.ChartClassifySaveBatch(chartClassifyInfo.Source)
 			}
 		}
 	} else {
@@ -1071,17 +1071,19 @@ func updateChildClassifySelection(classifyInfo *data_manage.ChartClassify, paren
 			)
 		}
 		return nil
+	}else {
+		// 处理二级及以上目录
+		if classifyInfo.IsSelected != parentClassifyInfo.IsSelected {
+			return data_manage.UpdateChartClassifyIsSelected(
+				classifyInfo.Source,
+				parentClassifyInfo.IsSelected,
+				classifyInfo.RootId,
+				classifyInfo.LevelPath,
+			)
+		}
 	}
 
-	// 处理二级及以上目录
-	if classifyInfo.IsSelected != parentClassifyInfo.IsSelected {
-		return data_manage.UpdateChartClassifyIsSelected(
-			classifyInfo.Source,
-			parentClassifyInfo.IsSelected,
-			classifyInfo.RootId,
-			classifyInfo.LevelPath,
-		)
-	}
+	
 	return nil
 }
 
@@ -1097,11 +1099,11 @@ func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyNam
 	}
 	oldSelected := classifyInfo.IsSelected
 	var parentClassifyInfo *data_manage.ChartClassify
+	parentClassifyInfo, err= data_manage.GetChartClassifyById(parentId)
+	if err != nil {
+		return
+	}
 	if parentId != classifyInfo.ParentId {
-		parentClassifyInfo, err= data_manage.GetChartClassifyById(parentId)
-		if err != nil {
-			return
-		}
 		if classifyInfo.Level != parentClassifyInfo.Level+1 {
 			err = errors.New("父级分类层级异常")
 			return
@@ -1191,7 +1193,7 @@ func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyNam
 			err = fmt.Errorf("更新子目录精选标识失败,Err:%w", err)
 			return
 		}
-		go eta_forum.ChartClassifySaveBatch(classifyInfo.ChartClassifyId)
+		go eta_forum.ChartClassifySaveBatch(classifyInfo.Source)
 	}
 
 	return