ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(user):修正转供电企业快速查询功能。

Browse Source
This commit is contained in:
徐涛 2022-09-18 22:24:09 +08:00
parent b638bc5f75
commit 720bdd54fe
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/user.go
View File

@ -270,13 +270,15 @@ func (_UserService) SearchLimitUsers(keyword string, limit int) ([]model.JoinedU
var users = make([]model.User, 0)
keywordCond := "%" + keyword + "%"
err := global.DB.NewSelect().Model(&users).Relation("Detail").
Where("user.type = ?", model.USER_TYPE_ENT).
Where("u.type = ?", model.USER_TYPE_ENT).
WhereGroup(" and ", func(q *bun.SelectQuery) *bun.SelectQuery {
return q.Where("user.username like ?", keywordCond).
WhereOr("user_detail.name like ?", keywordCond).
WhereOr("user_detail like ?", keywordCond)
return q.Where("u.username like ?", keywordCond).
WhereOr("detail.name like ?", keywordCond).
WhereOr("detail.abbr like ?", keywordCond).
WhereOr("detail.contact like ?", keywordCond).
WhereOr("detail.address like ?", keywordCond)
}).
Order("user.created_at asc").
Order("u.created_at asc").
Limit(limit).
Offset(0).
Scan(ctx)