lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-24 10:11:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into new-beego-path

Browse Source
This commit is contained in:
roberChen
2021-03-25 11:49:39 +08:00
parent 4e243e2d70 8ef7f5458c
commit 272316f7b4
17 changed files with 443 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
models/TeamMember.go
View File

@@ -205,16 +205,16 @@ func (m *TeamMember) FindNotJoinMemberByAccount(teamId int, account string, limi
}
o := orm.NewOrm()
sql := `select member.member_id,member.account,team.team_member_id
sql := `select member.member_id,member.account,member.real_name,team.team_member_id
from md_members as member
left join md_team_member as team on team.team_id = ? and member.member_id = team.member_id
where member.account like ? AND team_member_id IS NULL
where member.account like ? or member.real_name like ? AND team_member_id IS NULL
order by member.member_id desc
limit ?;`
members := make([]*Member, 0)
_, err := o.Raw(sql, teamId, "%"+account+"%", limit).QueryRows(&members)
_, err := o.Raw(sql, teamId, "%"+account+"%", "%"+account+"%", limit).QueryRows(&members)
if err != nil {
logs.Error("查询团队用户时出错 ->", err)
@@ -227,7 +227,7 @@ limit ?;`
for _, member := range members {
item := KeyValueItem{}
item.Id = member.MemberId
item.Text = member.Account
item.Text = member.Account + "[" + member.RealName + "]"
items = append(items, item)
}
result.Result = items