fix: admin关键词

models/classify.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -260,7 +259,7 @@ func GetClassifySubCountByParentId(classifyId int) (count int, err error) {
 // 删除分类
 //func DeleteClassify(classifyId int) (err error) {
 //	sql := `DELETE FROM classify WHERE id=? `
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	_, err = o.Raw(sql, classifyId).Exec()
 //	if err != nil {
 //		return
@@ -273,7 +272,7 @@ func GetClassifySubCountByParentId(classifyId int) (count int, err error) {
 // classifyName, abstract, descript string, parentId, classifyId int
 // 修改分类
 //func EditClassify(req *EditClassifyReq) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	//sql := `UPDATE classify SET classify_name = ?,abstract=?, parent_id= ?,descript=?,report_author=?,author_descript=?,column_img_url=?,head_img_url=?,avatar_img_url=?,report_img_url=?,home_img_url=?,classify_label=?,show_type=?,has_teleconference=?,vip_title=?,modify_time= NOW() WHERE id = ? `
 //	//_, err = o.Raw(sql, req.ClassifyName, req.Abstract, req.ParentId, req.Descript, req.ReportAuthor, req.AuthorDescript, req.ColumnImgUrl, req.HeadImgUrl, req.AvatarImgUrl, req.ReportImgUrl, req.HomeImgUrl, req.ClassifyLabel, req.ShowType, req.HasTeleconference, req.VipTitle, req.ClassifyId).Exec()
 //	sql := `UPDATE classify SET classify_name = ?,parent_id= ?,modify_time= NOW() WHERE id = ? `
@@ -290,7 +289,7 @@ func GetClassifySubCountByParentId(classifyId int) (count int, err error) {
 // @return err error
 //func ParentClassify() (items []*Classify, err error) {
 //	sql := `SELECT * FROM classify WHERE parent_id=0 order by id desc `
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	_, err = o.Raw(sql).QueryRows(&items)
 //	return
 //}
@@ -411,7 +410,7 @@ type ClassifyPermissionListResp struct {
 //	}
 //	pars = append(pars)
 //
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	_, err = o.Raw(sql, pars...).QueryRows(&items)
 //	return
 //}
@@ -444,7 +443,7 @@ type ClassifyPermissionListResp struct {
 //			sqlCount += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
 //		}
 //	}
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	err = o.Raw(sqlCount, pars...).QueryRow(&count)
 //	return
 //}
@@ -490,7 +489,7 @@ func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err erro
 //	if parentIdLen == 0 {
 //		return
 //	}
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	sql := ``
 //	pars := make([]interface{}, 0)
 //	pars = append(pars, parentId)
@@ -518,23 +517,23 @@ type EditClassifyPermissionReq struct {
 
 // GetAllClassify 获取所有分类
 func GetAllClassify() (list []*Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 // GetAllClassifyWithDesc 获取所有倒序分类
 func GetAllClassifyWithDesc() (list []*Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM classify ORDER BY id DESC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 // GetClassifyByKeyword 名称获取分类
 //func GetClassifyByKeyword(keyword string) (item Classify, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	sql := ` SELECT * FROM classify WHERE classify_name = ? LIMIT 1 `
 //	err = o.Raw(sql, keyword).QueryRow(&item)
 //	return
@@ -572,7 +571,7 @@ func GetClassifyByCondition(condition, orderRule string, pars []interface{}) (it
 
 // UpdateChildClassifyRelateSetting 更新子分类关联设置
 //func UpdateChildClassifyRelateSetting(parentId, relateTel, relateVideo int) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	sql := `UPDATE classify SET relate_tel = ?, relate_video = ? WHERE parent_id = ?`
 //	_, err = o.Raw(sql, relateTel, relateVideo, parentId).Exec()
 //	return
@@ -614,10 +613,7 @@ func (classifyInfo *Classify) GetMaxSortByParentId(parentId int) (maxSort int, e
 
 // GetMaxSort 获取最大的排序值
 func (classifyInfo *Classify) GetMaxSort() (maxSort int, err error) {
-	sql := `SELECT max(sort) AS sort FROM classify`
-	if utils.DbDriverName == utils.DbDriverByDm {
-		sql = `SELECT COALESCE(MAX(sort), 0) AS sort FROM classify`
-	}
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM classify`
 	var maxNull sql2.NullInt64
 	err = global.DbMap[utils.DbNameReport].Raw(sql).Scan(&maxNull).Error
 	if err != nil {

models/system/sys_admin.go

@@ -202,7 +202,7 @@ type SysuserEditEnabledReq struct {
 // 变更状态
 func EditAdminEnabled(item *Admin) (err error) {
 	o := global.DbMap[utils.DbNameMaster]
-	sql := `UPDATE admin
+	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),enabled=? WHERE admin_id = ? `
 	err = o.Exec(sql, item.Enabled, item.AdminId).Error
@@ -212,7 +212,7 @@ func EditAdminEnabled(item *Admin) (err error) {
 // DisableAdmin 禁用用户
 func DisableAdmin(adminId int) (err error) {
 	o := global.DbMap[utils.DbNameMaster]
-	sql := `UPDATE admin
+	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),disable_time=now(),enabled=0 WHERE admin_id = ? `
 	err = o.Exec(sql, adminId).Error
@@ -337,7 +337,7 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 				real_name,
 				mobile
 			FROM
-				admin
+				"admin"
 			WHERE
 				role_type_code LIKE '%rai%'
 			AND group_id NOT IN (19, 10)

models/system/sys_role.go

@@ -135,11 +135,11 @@ type RoleMenu struct {
 }
 
 type RoleMenuList struct {
-	MenuId    int    `description:"导航唯一标识"`
-	Name      string `description:"导航名称"`
-	NameEn    string `description:"导航名称（英文）"`
-	Child     []*RoleMenu
-	CheckList []int
+	MenuId    int         `description:"导航唯一标识"`
+	Name      string      `description:"导航名称"`
+	NameEn    string      `description:"导航名称（英文）"`
+	Child     []*RoleMenu `gorm:"-"`
+	CheckList []int       `gorm:"-"`
 }
 
 type RoleMenuListResp struct {