Browse Source

sort 字段处理

xyxie 5 months ago
parent
commit
8669e34a32

+ 1 - 1
models/ai_summary/ai_pormpt.go

@@ -120,7 +120,7 @@ func GetAiPromptMaxSort(adminId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_prompt WHERE sys_admin_id=? `
 	//err = o.Raw(sql, adminId).QueryRow(&sort)
-	sql := `SELECT Max(sort) AS sort FROM ai_prompt WHERE sys_admin_id=? `
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_prompt WHERE sys_admin_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).First(&sort).Error
 	return
 }

+ 2 - 2
models/ai_summary/ai_summary.go

@@ -191,7 +191,7 @@ func GetAiSummaryMaxSort(classifyId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_summary WHERE parent_id=? `
 	//err = o.Raw(sql, classifyId).QueryRow(&sort)
-	sql := `SELECT Max(sort) AS sort FROM ai_summary WHERE parent_id=? `
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_summary WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }
@@ -216,4 +216,4 @@ func GetSummaryCountByCondition(condition string, pars []interface{}) (count int
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 
 	return
-}
+}

+ 3 - 3
models/ai_summary/ai_summary_classify.go

@@ -187,7 +187,7 @@ func GetAiSummaryClassifyMaxSort(parentId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_summary_classify WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&sort)
-	sql := `SELECT Max(sort) AS sort FROM ai_summary_classify WHERE parent_id=? `
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_summary_classify WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }
@@ -478,7 +478,7 @@ func DeleteAiSummaryClassifyByIds(ids []int) (err error) {
 	//o := orm.NewOrm()
 	//sql := ` DELETE FROM ai_summary_classify WHERE ai_summary_classify_id in (?)`
 	//_, err = o.Raw(sql, ids).Exec()
-	sql := ` DELETE FROM ai_summary_classify WHERE ai_summary_classify_id in (`+ utils.GetOrmInReplace(len(ids)) +`)`
+	sql := ` DELETE FROM ai_summary_classify WHERE ai_summary_classify_id in (` + utils.GetOrmInReplace(len(ids)) + `)`
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
-}
+}

+ 3 - 3
models/bi_dashboard/bi_dashboard_classify.go

@@ -96,12 +96,12 @@ type EditDashboardClassifyReq struct {
 }
 
 type DelDashboardClassifyReq struct {
-	BiDashboardClassifyId int    `description:"看板id"`
+	BiDashboardClassifyId int `description:"看板id"`
 }
 
 // GetBiDashboardClassifyMaxSort 获取看板分类下最大的排序数
 func GetBiDashboardClassifyMaxSort() (sort int, err error) {
-	sql := `SELECT Max(sort) AS sort FROM bi_dashboard_classify `
+	sql := `SELECT COALESCE(Max(sort), 0) AS sort FROM bi_dashboard_classify `
 	err = global.DEFAULT_DmSQL.Raw(sql).First(&sort).Error
 	return
 }
@@ -123,4 +123,4 @@ type RespPublicGroupListItem struct {
 func GetBiDashboardClassifyByName(classifyName string) (count int64, err error) {
 	err = global.DEFAULT_DmSQL.Model(&BiDashboardClassify{}).Where("bi_dashboard_classify_name = ?", classifyName).Count(&count).Error
 	return
-}
+}

+ 2 - 2
models/chart_permission.go

@@ -214,7 +214,7 @@ func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `select max(sort) from chart_permission `
 	//err = o.Raw(sql).QueryRow(&maxSort)
-	sql := `select COALESCE(Max(sort), 0) from chart_permission `
+	sql := `select COALESCE(Max(sort), 0) as max_sort from chart_permission `
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
@@ -224,7 +224,7 @@ func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err e
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `select max(sort) from chart_permission WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
-	sql := `select max(sort) from chart_permission WHERE parent_id=? `
+	sql := `select  COALESCE(Max(sort), 0) as max_sort from chart_permission WHERE parent_id=? `
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }

+ 2 - 2
models/classify.go

@@ -465,7 +465,7 @@ func (classifyInfo *Classify) GetMaxSortByParentId(parentId int) (maxSort int, e
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `SELECT max(sort) AS sort FROM classify WHERE parent_id = ? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
-	sql := `SELECT max(sort) AS sort FROM classify WHERE parent_id = ? `
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM classify WHERE parent_id = ? `
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }
@@ -475,7 +475,7 @@ func (classifyInfo *Classify) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `SELECT max(sort) AS sort FROM classify`
 	//err = o.Raw(sql).QueryRow(&maxSort)
-	sql := `SELECT max(sort) AS sort FROM classify`
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM classify`
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }

+ 1 - 1
models/data_manage/base_from_baiinfo.go

@@ -106,7 +106,7 @@ func GetBaseFromBaiinfoIndexByIndexId(indexId int) (item *BaseFromBaiinfoIndex,
 // GetBaseFromBaiinfoIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromBaiinfoIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT max(sort) FROM base_from_baiinfo_index WHERE classify_id=? `
+	sql := `SELECT  COALESCE(Max(sort), 0) as sort FROM base_from_baiinfo_index WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 2 - 2
models/english_classify.go

@@ -20,7 +20,7 @@ func UpdateEnglishClassifySortByParentId(parentId, permissionId, nowSort int, up
 // GetMaxSortByParentId 获取最大的排序值
 func (classifyInfo *EnglishClassify) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT max(sort) AS sort FROM english_classify WHERE parent_id = ? `
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM english_classify WHERE parent_id = ? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
@@ -29,7 +29,7 @@ func (classifyInfo *EnglishClassify) GetMaxSortByParentId(parentId int) (maxSort
 // GetMaxSort 获取最大的排序值
 func (classifyInfo *EnglishClassify) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT max(sort) AS sort FROM english_classify`
+	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM english_classify`
 	//err = o.Raw(sql).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return