xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-12 04:03:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(admin):修复消息查询

Browse Source
This commit is contained in:
小宝
2025-10-21 15:04:58 +08:00
parent e8c94f1c98
commit 70076c90fd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/internal/logic/admin/notice.go
View File

@@ -24,7 +24,6 @@ import (
"github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gconv"
) )
type sAdminNotice struct{} type sAdminNotice struct{}
@@ -162,7 +161,6 @@ func (s *sAdminNotice) View(ctx context.Context, in *adminin.NoticeViewInp) (res
// api列表 不需要登陆 // api列表 不需要登陆
func (s *sAdminNotice) ApiList(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeViewModel, totalCount int, err error) { func (s *sAdminNotice) ApiList(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeViewModel, totalCount int, err error) {
mod := s.Model(ctx) mod := s.Model(ctx)
if in.Title != "" { if in.Title != "" {
@@ -198,6 +196,7 @@ func (s *sAdminNotice) ApiList(ctx context.Context, in *adminin.NoticeListInp) (
return list, totalCount, err return list, totalCount, err
} }
// List 获取列表 // List 获取列表
func (s *sAdminNotice) List(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) { func (s *sAdminNotice) List(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) {
var memberId = contexts.GetUserId(ctx) var memberId = contexts.GetUserId(ctx)
@@ -369,8 +368,8 @@ func (s *sAdminNotice) messageIds(ctx context.Context, memberId int64) (ids []in
Fields(dao.AdminNotice.Columns().Id). Fields(dao.AdminNotice.Columns().Id).
Where(dao.AdminNotice.Columns().Status, consts.StatusEnabled). Where(dao.AdminNotice.Columns().Status, consts.StatusEnabled).
Where( Where(
s.Model(ctx, &handler.Option{FilterAuth: false}).Builder().WhereIn("type",[]int{consts.NoticeTypeNotify, consts.NoticeTypeNotice}). s.Model(ctx, &handler.Option{FilterAuth: false}).Builder().WhereIn("type", []int{consts.NoticeTypeNotify, consts.NoticeTypeNotice}).
WhereOr(s.Model(ctx, &handler.Option{FilterAuth: false}).Builder().Where("type", consts.NoticeTypeLetter).Wheref("receiver->>'$.key'= ?", gconv.String(memberId))), WhereOr(s.Model(ctx, &handler.Option{FilterAuth: false}).Builder().Where("type", consts.NoticeTypeLetter)),
).Array() ).Array()
if err != nil { if err != nil {
err = gerror.Wrap(err, "获取我的消息失败！") err = gerror.Wrap(err, "获取我的消息失败！")