Browse Source

达梦改造

gmy 6 months ago
parent
commit
09273dc2c5
2 changed files with 4 additions and 5 deletions
  1. 3 3
      global/dm.go
  2. 1 2
      models/report_chapter.go

+ 3 - 3
global/dm.go

@@ -35,13 +35,13 @@ func InitDm() {
 	})
 
 	// eta_report
-	connectDm("utils.DM_URL", "default", newLogger, dmSqlMap, true)
+	connectDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
 
 	// eta_master
-	connectDm("utils.DM_URL_DATA", "eta", newLogger, dmSqlMap, false)
+	connectDm(utils.MYSQL_URL_ETA, "eta", newLogger, dmSqlMap, false)
 
 	// crm_master
-	connectDm("utils.DM_URL_DATA", "weekly", newLogger, dmSqlMap, false)
+	connectDm(utils.MYSQL_WEEKLY_URL, "weekly", newLogger, dmSqlMap, false)
 
 	//全局赋值数据库链接
 	DmSQL = dmSqlMap

+ 1 - 2
models/report_chapter.go

@@ -40,7 +40,6 @@ type ReportChapter struct {
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
 
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
-	err = global.DEFAULT_DmSQL.Raw(sql, reportId).Scan(&list).Error
-
+	err = global.DEFAULT_DmSQL.Raw(sql, reportId).Find(&list).Error
 	return
 }