浏览代码

通知消息bug修复

genlong 6 月之前
父节点
当前提交
b09bc07f82
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 1 1
      models/data_manage/chart_info.go
  2. 2 0
      models/report_approve/report_approve_message.go

+ 1 - 1
models/data_manage/chart_info.go

@@ -2840,7 +2840,7 @@ func UpdateChartInfoSortByClassifyIdV2(classifyId, nowSort int, prevChartInfoId
 // GetChartInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetChartInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT Max(sort) AS sort FROM chart_info WHERE chart_classify_id = ? `
+	sql := `SELECT COALESCE(MAX(sort),0) AS sort FROM chart_info WHERE chart_classify_id = ? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 2 - 0
models/report_approve/report_approve_message.go

@@ -172,6 +172,8 @@ func (m *ReportApproveMessage) GetPageItemsByCondition(condition string, pars []
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
+	pars = append(pars, startSize)
+	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }