xyxie пре 5 месеци
родитељ
комит
79665610a5

+ 1 - 1
models/data_manage/excel/excel_classify.go

@@ -343,7 +343,7 @@ func (ExcelClassify *ExcelClassify) Update(cols []string) (err error) {
 
 func GetExcelClassifyMaxSort(parentId int, source int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT Max(sort) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
 	err = o.Raw(sql, parentId, source).Scan(&sort).Error
 	return
 }

+ 1 - 1
models/data_manage/excel/excel_info.go

@@ -1072,7 +1072,7 @@ type BatchRefreshExcelReq struct {
 // GetExcelMaxSortByClassifyId 获取当前分类下,且排序数最大的excel
 func GetExcelMaxSortByClassifyId(classifyId int, source int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := ` SELECT Max(sort) AS sort FROM excel_info WHERE excel_classify_id=? AND source = ? AND is_delete=0 order by sort desc,excel_info_id desc limit 1`
+	sql := ` SELECT COALESCE(MAX(sort), 0) AS sort FROM excel_info WHERE excel_classify_id=? AND source = ? AND is_delete=0 order by sort desc,excel_info_id desc limit 1`
 	err = o.Raw(sql, classifyId, source).Scan(&sort).Error
 	return
 }

+ 1 - 1
models/data_manage/future_good/future_good_chart_classify.go

@@ -187,7 +187,7 @@ func (FutureGoodChartClassify *FutureGoodChartClassify) Update(cols []string) (e
 // GetFutureGoodChartClassifyMaxSort 获取图表分类下最大的排序数
 func GetFutureGoodChartClassifyMaxSort(parentId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT Max(sort) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
 	err = o.Raw(sql, parentId).Scan(&sort).Error
 	return
 }