diff --git a/DockerfileWindowsTest b/DockerfileWindowsTest index 5b22a7c..45e7697 100644 --- a/DockerfileWindowsTest +++ b/DockerfileWindowsTest @@ -26,7 +26,7 @@ RUN apk update --no-cache RUN apk add --no-cache ca-certificates RUN apk add --no-cache tzdata COPY ./conf /app/conf -COPY ./conf /conf +COPY ./conf/test /conf ENV TZ Asia/Shanghai ENV MODE_ENV test WORKDIR /app diff --git a/build/artistinfo-dev b/build/artistinfo-dev deleted file mode 100644 index 40caa0f..0000000 Binary files a/build/artistinfo-dev and /dev/null differ diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index 17f9d3d..260de1c 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -888,7 +888,8 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti var inviteRelationIds []int64 db.DB.Model(model.Invite{}).Where("user_id = ?", inviteUser.ID).Pluck("invited_id", &inviteRelationIds) 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 } for _, v := range invitedList {