diff --git a/src/dao/user_certificate_dao.go b/src/dao/user_certificate_dao.go index f083f99..0130067 100644 --- a/src/dao/user_certificate_dao.go +++ b/src/dao/user_certificate_dao.go @@ -3,7 +3,7 @@ package dao import "code.fnuoos.com/EggPlanet/egg_models.git/src/model" type UserCertificateDao interface { - FindUserCertificate(page, limit, uid string) (*[]model.UserCertificate, error) + FindUserCertificate(page, limit, uid string) (*[]model.UserCertificate, int64, error) GetUserCertificateByNo(no string) (*model.UserCertificate, error) GetUserCertificateById(id string) (*model.UserCertificate, error) } diff --git a/src/implement/user_certificate_implement.go b/src/implement/user_certificate_implement.go index f82549b..15e304f 100644 --- a/src/implement/user_certificate_implement.go +++ b/src/implement/user_certificate_implement.go @@ -17,18 +17,18 @@ type UserCertificateDb struct { Db *xorm.Engine } -func (u UserCertificateDb) FindUserCertificate(page, limit, uid string) (*[]model.UserCertificate, error) { +func (u UserCertificateDb) FindUserCertificate(page, limit, uid string) (*[]model.UserCertificate, int64, error) { var m []model.UserCertificate sess := u.Db.Where("1=1") if uid != "" { sess.In("uid", strings.Split(uid, ",")) } start := (zhios_order_relate_utils.StrToInt(page) - 1) * zhios_order_relate_utils.StrToInt(limit) - err := sess.Limit(zhios_order_relate_utils.StrToInt(limit), start).OrderBy("id desc").Find(&m) + total, err := sess.Limit(zhios_order_relate_utils.StrToInt(limit), start).OrderBy("id desc").FindAndCount(&m) if err != nil { - return nil, zhios_order_relate_logx.Error(err) + return nil, 0, zhios_order_relate_logx.Error(err) } - return &m, nil + return &m, total, nil } func (u UserCertificateDb) GetUserCertificateByNo(no string) (m *model.UserCertificate, err error) {