|
@@ -3,7 +3,6 @@ package models
|
|
|
import (
|
|
|
"eta/eta_api/global"
|
|
|
"eta/eta_api/utils"
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -47,7 +46,7 @@ func (item *ClassifyMenu) InsertMulti(items []*ClassifyMenu) (err error) {
|
|
|
|
|
|
// GetClassifyMenuById 主键获取子目录
|
|
|
//func GetClassifyMenuById(id int) (item *ClassifyMenu, err error) {
|
|
|
-// o := orm.NewOrmUsingDB("rddp")
|
|
|
+// o := global.DbMap[utils.DbNameReport]
|
|
|
// sql := `SELECT * FROM classify_menu WHERE menu_id = ? LIMIT 1`
|
|
|
// err = o.Raw(sql, id).QueryRow(&item)
|
|
|
// return
|
|
@@ -55,11 +54,11 @@ func (item *ClassifyMenu) InsertMulti(items []*ClassifyMenu) (err error) {
|
|
|
|
|
|
// GetClassifyMenuList 获取子目录列表
|
|
|
func GetClassifyMenuList(condition string, pars []interface{}) (list []*ClassifyMenu, err error) {
|
|
|
- o := orm.NewOrmUsingDB("rddp")
|
|
|
+ o := global.DbMap[utils.DbNameReport]
|
|
|
sql := `SELECT * FROM classify_menu WHERE 1 = 1 `
|
|
|
sql += condition
|
|
|
sql += ` ORDER BY sort ASC, create_time ASC`
|
|
|
- _, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
+ err = o.Raw(sql, pars...).Find(&list).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -72,7 +71,7 @@ type ClassifyMenuSaveReq struct {
|
|
|
|
|
|
// InsertAndUpdateClassifyMenu 新增/编辑/删除分类子目录
|
|
|
//func InsertAndUpdateClassifyMenu(insertMenus []*ClassifyMenu, editMenus []*ClassifyMenu, deleteMenuIds []int) (err error) {
|
|
|
-// o := orm.NewOrmUsingDB("rddp")
|
|
|
+// o := global.DbMap[utils.DbNameReport]
|
|
|
// tx, err := o.Begin()
|
|
|
// if err != nil {
|
|
|
// return
|