xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-12-28 02:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

发布v2.7.6版本

Browse Source
This commit is contained in:
孟帅
2023-06-19 17:49:34 +08:00
parent aff0ff3af5
commit 773f26b479
23 changed files with 645 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
server/internal/dao/admin_menu.go
View File

@@ -5,11 +5,7 @@
package dao
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"hotgo/internal/consts"
"hotgo/internal/dao/internal"
"hotgo/internal/model/entity"
)
// internalAdminMenuDao is internal type for wrapping internal DAO implements.
@@ -27,45 +23,3 @@ var (
internal.NewAdminMenuDao(),
}
)
// IsUniqueTitle 判断标题是否唯一
func (dao *adminMenuDao) IsUniqueTitle(ctx context.Context, id int64, title string) (bool, error) {
var data *entity.AdminMenu
m := dao.Ctx(ctx).Where("title", title)
if id > 0 {
m = m.WhereNot("id", id)
}
if err := m.Scan(&data); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return false, err
}
if data == nil {
return true, nil
}
return false, nil
}
// IsUniqueName 判断编码是否唯一
func (dao *adminMenuDao) IsUniqueName(ctx context.Context, id int64, name string) (bool, error) {
var data *entity.AdminMenu
m := dao.Ctx(ctx).Where("name", name)
if id > 0 {
m = m.WhereNot("id", id)
}
if err := m.Scan(&data); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return false, err
}
if data == nil {
return true, nil
}
return false, nil
}

19
server/internal/dao/sys_dict_type.go
View File

@@ -7,6 +7,7 @@ package dao
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"hotgo/internal/consts"
"hotgo/internal/dao/internal"
"hotgo/internal/model/entity"
@@ -53,20 +54,12 @@ func (dao *sysDictTypeDao) IsUniqueType(ctx context.Context, id int64, typeName
// GetTypes 获取指定ID的所有类型标识，包含下级
func (dao *sysDictTypeDao) GetTypes(ctx context.Context, id int64) (types []string, err error) {
m := dao.Ctx(ctx).Fields("type").Where("id", id).
columns, err := dao.Ctx(ctx).Fields("type").
Where("id", id).
WhereOr("pid", id).
Where("status", consts.StatusEnabled)
list, err := m.Array()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return types, err
}
for _, v := range list {
types = append(types, v.String())
}
return types, nil
Where("status", consts.StatusEnabled).All()
types = g.NewVar(columns).Strings()
return
}
// GetType 获取指定ID的类型标识