hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 通知优化

Browse Source
This commit is contained in:
yxh 2024-01-09 09:41:25 +08:00
parent ce18dfd07a
commit 64fa125cf1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/app/system/logic/sysNotice/sys_notice.go
View File

@ -267,7 +267,7 @@ func (s *sSysNotice) UnReadCount(ctx context.Context, currentUserId uint64) (sys
} }
all, serr := dao.SysNotice.Ctx(ctx). all, serr := dao.SysNotice.Ctx(ctx).
WhereIn(dao.SysNotice.Columns().Id, noticeIds). WhereIn(dao.SysNotice.Columns().Id, noticeIds).
Where(dao.SysNotice.Columns().Type, t).Count() Count()
if serr != nil { if serr != nil {
return 0 return 0
} }
@ -326,12 +326,14 @@ func (s *sSysNotice) NoticeReadAddUserId(ctx context.Context, req *model.SysNoti
func (s *sSysNotice) CurrentUseWithIds(ctx context.Context, currentUserId uint64, noticeType int) (ids []int64, err error) { func (s *sSysNotice) CurrentUseWithIds(ctx context.Context, currentUserId uint64, noticeType int) (ids []int64, err error) {
m := dao.SysNotice.Ctx(ctx) m := dao.SysNotice.Ctx(ctx)
m = m.Where("status =?", 1). m = m.Where(dao.SysNotice.Columns().Status, 1).
Where("type=?", noticeType) Where(dao.SysNotice.Columns().Type, noticeType)
if noticeType == consts.SysLetterType {
if service.ToolsGenTable().IsMysql() { if service.ToolsGenTable().IsMysql() {
m = m.Where("(`type` = ? OR (`type` = ? and JSON_CONTAINS(`receiver`,'?')))", consts.SysNoticeType, consts.SysLetterType, currentUserId) m = m.Where("JSON_CONTAINS(`receiver`,'" + fmt.Sprintf("%d", currentUserId) + "')")
} else { } else {
m = m.Where("(type = ? OR (type = ? and receiver::jsonb @> '"+gconv.String(currentUserId)+"'::jsonb))", consts.SysNoticeType, consts.SysLetterType) m = m.Where("receiver::jsonb @> '" + gconv.String(currentUserId) + "'::jsonb")
}
} }
all, err := m.Fields("id").All() all, err := m.Fields("id").All()
if err != nil { if err != nil {