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-08-13 07:59:01 +08:00
parent e3597cf866
commit 476c9d8cd5
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
repository/user.go
View File

@ -52,33 +52,35 @@ func (_UserRepository) FindUserByID(uid string) (*model.User, error) {
return _postProcessSingle(user, has, err) return _postProcessSingle(user, has, err)
} }
func (_UserRepository) ListUserDetail(keyword string, userType int, userState *bool, page int) ([]*model.JoinedUserDetail, int64, error) { func (_UserRepository) ListUserDetail(keyword string, userType int, userState *bool, page int) ([]model.JoinedUserDetail, int64, error) {
var cond = builder.NewCond() var cond = builder.NewCond()
if len(keyword) != 0 { if len(keyword) != 0 {
keywordCond := builder.NewCond(). keywordCond := builder.NewCond().
Or(builder.Like{"user.username", keyword}). Or(builder.Like{"u.username", keyword}).
Or(builder.Like{"user_detail.name", keyword}) Or(builder.Like{"d.name", keyword})
cond = cond.And(keywordCond) cond = cond.And(keywordCond)
} }
if userType != -1 { if userType != -1 {
cond = cond.And(builder.Eq{"user.type": userType}) cond = cond.And(builder.Eq{"u.type": userType})
} }
if userState != nil { if userState != nil {
cond = cond.And(builder.Eq{"user.enabled": *userState}) cond = cond.And(builder.Eq{"u.enabled": *userState})
} }
startItem := (page - 1) * config.ServiceSettings.ItemsPageSize startItem := (page - 1) * config.ServiceSettings.ItemsPageSize
total, err := global.DBConn. total, err := global.DBConn.
Join("INNER", "user_detail", "user_detail.id=user.id"). Table("user_detail").Alias("d").
Join("INNER", []string{"user", "u"}, "d.id=u.id").
Where(cond). Where(cond).
Count() Count(&model.User{})
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
users := make([]*model.JoinedUserDetail, 0) users := make([]model.JoinedUserDetail, 0)
err = global.DBConn. err = global.DBConn.
Join("INNER", "user_detail", "user_detail.id=user.id"). Table("user_detail").Alias("d").
Join("INNER", []string{"user", "u"}, "d.id=u.id").
Where(cond). Where(cond).
Limit(config.ServiceSettings.ItemsPageSize, startItem). Limit(config.ServiceSettings.ItemsPageSize, startItem).
Find(users) Find(&users)
return users, total, err return users, total, err
} }