From 8c4ab88888b93a8bf2326e3609ea565710daade6 Mon Sep 17 00:00:00 2001 From: Ulric Qin Date: Thu, 17 Feb 2022 19:28:35 +0800 Subject: [PATCH] return all busi-groups when subscribe --- src/models/user.go | 4 ++-- src/webapi/router/router_busi_group.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/models/user.go b/src/models/user.go index 67262eb6..df803e65 100644 --- a/src/models/user.go +++ b/src/models/user.go @@ -435,11 +435,11 @@ func (u *User) NopriIdents(idents []string) ([]string, error) { // 我是管理员，返回所有 // 或者我是成员 -func (u *User) BusiGroups(limit int, query string) ([]BusiGroup, error) { +func (u *User) BusiGroups(limit int, query string, all ...bool) ([]BusiGroup, error) { session := DB().Order("name").Limit(limit) var lst []BusiGroup - if u.IsAdmin() { + if u.IsAdmin() || (len(all) > 0 && all[0]) { err := session.Where("name like ?", "%"+query+"%").Find(&lst).Error return lst, err } diff --git a/src/webapi/router/router_busi_group.go b/src/webapi/router/router_busi_group.go index 9757b6bc..4bba2c66 100644 --- a/src/webapi/router/router_busi_group.go +++ b/src/webapi/router/router_busi_group.go @@ -98,9 +98,10 @@ func busiGroupDel(c *gin.Context) { func busiGroupGets(c *gin.Context) { limit := ginx.QueryInt(c, "limit", defaultLimit) query := ginx.QueryStr(c, "query", "") + all := ginx.QueryBool(c, "all", false) me := c.MustGet("user").(*models.User) - lst, err := me.BusiGroups(limit, query) + lst, err := me.BusiGroups(limit, query, all) ginx.NewRender(c).Data(lst, err) } -- GitLab