mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-11-13 20:53:49 +08:00
feat 调整 mysql 、pgsql 初始化数据; 完善pgsql 兼容性,适配代码生成逻辑
This commit is contained in:
@@ -99,6 +99,11 @@ func (s *sAdminMenu) Edit(ctx context.Context, in *adminin.MenuEditInp) (err err
|
||||
return
|
||||
}
|
||||
|
||||
if (in.Type == 1 || in.Type == 2) && len(in.Component) == 0 {
|
||||
err = gerror.Newf("请先设置目录组件/路径")
|
||||
return
|
||||
}
|
||||
|
||||
return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
|
||||
in.Pid, in.Level, in.Tree, err = hgorm.AutoUpdateTree(ctx, &dao.AdminMenu, in.Id, in.Pid)
|
||||
if err != nil {
|
||||
@@ -111,7 +116,7 @@ func (s *sAdminMenu) Edit(ctx context.Context, in *adminin.MenuEditInp) (err err
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
if _, err = dao.AdminMenu.Ctx(ctx).Data(in).OmitNilData().Insert(); err != nil {
|
||||
if _, err = dao.AdminMenu.Ctx(ctx).Data(in).OmitEmptyData().Insert(); err != nil {
|
||||
err = gerror.Wrap(err, "新增菜单失败!")
|
||||
return err
|
||||
}
|
||||
@@ -239,8 +244,8 @@ func (s *sAdminMenu) LoginPermissions(ctx context.Context, memberId int64) (list
|
||||
var (
|
||||
allPermissions []*Permissions
|
||||
mod = dao.AdminMenu.Ctx(ctx).Fields(dao.AdminMenu.Columns().Permissions).
|
||||
Where(dao.AdminMenu.Columns().Status, consts.StatusEnabled).
|
||||
WhereNot(dao.AdminMenu.Columns().Permissions, "")
|
||||
Where(dao.AdminMenu.Columns().Status, consts.StatusEnabled).
|
||||
WhereNot(dao.AdminMenu.Columns().Permissions, "")
|
||||
)
|
||||
|
||||
// 非超管验证允许的菜单列表
|
||||
|
||||
@@ -60,6 +60,11 @@ func (s *sAdminNotice) Edit(ctx context.Context, in *adminin.NoticeEditInp) (err
|
||||
return
|
||||
}
|
||||
|
||||
if in.Content == "" {
|
||||
err = gerror.New("请输入消息内容")
|
||||
return
|
||||
}
|
||||
|
||||
if in.Type == consts.NoticeTypeLetter && len(in.Receiver) == 0 {
|
||||
err = gerror.New("私信类型必须选择接收人")
|
||||
return
|
||||
|
||||
@@ -297,7 +297,7 @@ func (s *sAdminOrder) List(ctx context.Context, in *adminin.OrderListInp) (list
|
||||
// 操作人摘要信息
|
||||
mod = mod.Hook(hook.MemberSummary)
|
||||
|
||||
totalCount, err = mod.Clone().Count(1)
|
||||
totalCount, err = mod.Clone().Count()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user