fix bug

models/data_manage/chart_classify.go

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

models/data_manage/excel/excel_info.go

@@ -880,7 +880,7 @@ func GetExcelMaxSortByClassifyId(classifyId int, source int) (sort int, err erro
 	//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`
 	//err = o.Raw(sql, classifyId, source).QueryRow(&sort)
 
-	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 = global.DmSQL["data"].Raw(sql, classifyId, source).Scan(&sort).Error
 	return
 }

models/report_approve/report_approve.go

@@ -378,7 +378,7 @@ func GetApplyReportApproveCount(cond string, pars []interface{}) (count int, err
 	base := fmt.Sprintf(`SELECT a.* FROM report_approve AS a WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

services/classify.go

@@ -203,7 +203,7 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 		}
 		return
 	}
-	if item != nil {
+	if item != nil && item.Id > 0 {
 		errMsg = "分类名称:" + classifyName + "已存在"
 		isSendEmail = false
 		err = errors.New(errMsg)