修改配置文件
This commit is contained in:
parent
1e6edde67c
commit
a13c06cf4b
@ -26,7 +26,7 @@ RUN apk update --no-cache
|
|||||||
RUN apk add --no-cache ca-certificates
|
RUN apk add --no-cache ca-certificates
|
||||||
RUN apk add --no-cache tzdata
|
RUN apk add --no-cache tzdata
|
||||||
COPY ./conf /app/conf
|
COPY ./conf /app/conf
|
||||||
COPY ./conf /conf
|
COPY ./conf/test /conf
|
||||||
ENV TZ Asia/Shanghai
|
ENV TZ Asia/Shanghai
|
||||||
ENV MODE_ENV test
|
ENV MODE_ENV test
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
Binary file not shown.
@ -888,7 +888,8 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
|
|||||||
var inviteRelationIds []int64
|
var inviteRelationIds []int64
|
||||||
db.DB.Model(model.Invite{}).Where("user_id = ?", inviteUser.ID).Pluck("invited_id", &inviteRelationIds)
|
db.DB.Model(model.Invite{}).Where("user_id = ?", inviteUser.ID).Pluck("invited_id", &inviteRelationIds)
|
||||||
var invitedList []model.User
|
var invitedList []model.User
|
||||||
if err = db.DB.Where("id in ?", invitedList).Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
tx = db.DB.Model(model.User{}).Where("id in ?", inviteRelationIds)
|
||||||
|
if err = tx.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
for _, v := range invitedList {
|
for _, v := range invitedList {
|
||||||
|
Loading…
Reference in New Issue
Block a user