From 1a83ce356a7ee125923c3a198226040edbdc7b9a Mon Sep 17 00:00:00 2001 From: chenlin Date: Wed, 10 Jul 2024 17:07:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=9B=202.=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=88/api/v1/u?= =?UTF-8?q?ser/data=EF=BC=89=E5=87=BA=E5=8F=82=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5role=5Fkey=EF=BC=8C=E9=85=8D=E5=90=88=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=B4=E6=97=B6=E5=BA=97=E5=91=98=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/account.go | 10 + controller/activity.go | 2 +- model/autogenerated_user.go | 568 ++++++++++++++++++----------------- model/model_test.go | 30 +- model/user.go | 43 ++- pack/configs/dev/server.json | 8 +- 6 files changed, 348 insertions(+), 313 deletions(-) diff --git a/controller/account.go b/controller/account.go index b7e907f..a0bd271 100644 --- a/controller/account.go +++ b/controller/account.go @@ -533,6 +533,16 @@ func UserData(c *gin.Context) { } m.StoreList = sysUser.StoreList m.RoleId = uint32(sysUser.RoleId) + + if m.RoleId != 0 { + var roleInfo model.SysRole + err = model.NewSysRoleQuerySet(model.DB).IDEq(m.RoleId).Find(&roleInfo) + if err != nil { + logger.Error(err) + } + m.RoleKey = roleInfo.RoleKey + } + ret := m RespOK(c, ret) return diff --git a/controller/activity.go b/controller/activity.go index a2fba9b..ce0da7d 100644 --- a/controller/activity.go +++ b/controller/activity.go @@ -594,7 +594,7 @@ func MemberRenewalUserCouponList(c *gin.Context) { list := make([]model.UserCoupon, 0, len(coupons)) for i, _ := range coupons { - if !user.IsMember() && coupons[i].ActivityType == 1 { + if user.OpenMemberTime.IsZero() && coupons[i].ActivityType == 1 { continue } if user.MemberGenre == 201 || user.MemberGenre == 202 { diff --git a/model/autogenerated_user.go b/model/autogenerated_user.go index a3d964e..8eeeeef 100644 --- a/model/autogenerated_user.go +++ b/model/autogenerated_user.go @@ -14005,9 +14005,9 @@ func (qs UserQuerySet) OrderAscByWxUnionID() UserQuerySet { return qs.w(qs.db.Order("wx_union_id ASC")) } -// OrderAscByXcxRoleId is an autogenerated method +// OrderAscBySysRoleId is an autogenerated method // nolint: dupl -func (qs UserQuerySet) OrderAscByXcxRoleId() UserQuerySet { +func (qs UserQuerySet) OrderAscBySysRoleId() UserQuerySet { return qs.w(qs.db.Order("xcx_role_id ASC")) } @@ -14233,9 +14233,9 @@ func (qs UserQuerySet) OrderDescByWxUnionID() UserQuerySet { return qs.w(qs.db.Order("wx_union_id DESC")) } -// OrderDescByXcxRoleId is an autogenerated method +// OrderDescBySysRoleId is an autogenerated method // nolint: dupl -func (qs UserQuerySet) OrderDescByXcxRoleId() UserQuerySet { +func (qs UserQuerySet) OrderDescBySysRoleId() UserQuerySet { return qs.w(qs.db.Order("xcx_role_id DESC")) } @@ -15031,60 +15031,60 @@ func (qs UserQuerySet) WxUnionIDNotlike(wxUnionID string) UserQuerySet { return qs.w(qs.db.Where("wx_union_id NOT LIKE ?", wxUnionID)) } -// XcxRoleIdEq is an autogenerated method +// SysRoleIdEq is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdEq(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id = ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdEq(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id = ?", SysRoleId)) } -// XcxRoleIdGt is an autogenerated method +// SysRoleIdGt is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdGt(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id > ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdGt(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id > ?", SysRoleId)) } -// XcxRoleIdGte is an autogenerated method +// SysRoleIdGte is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdGte(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id >= ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdGte(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id >= ?", SysRoleId)) } -// XcxRoleIdIn is an autogenerated method +// SysRoleIdIn is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdIn(xcxRoleId ...uint32) UserQuerySet { - if len(xcxRoleId) == 0 { - qs.db.AddError(errors.New("must at least pass one xcxRoleId in XcxRoleIdIn")) +func (qs UserQuerySet) SysRoleIdIn(SysRoleId ...uint32) UserQuerySet { + if len(SysRoleId) == 0 { + qs.db.AddError(errors.New("must at least pass one SysRoleId in SysRoleIdIn")) return qs.w(qs.db) } - return qs.w(qs.db.Where("xcx_role_id IN (?)", xcxRoleId)) + return qs.w(qs.db.Where("xcx_role_id IN (?)", SysRoleId)) } -// XcxRoleIdLt is an autogenerated method +// SysRoleIdLt is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdLt(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id < ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdLt(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id < ?", SysRoleId)) } -// XcxRoleIdLte is an autogenerated method +// SysRoleIdLte is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdLte(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id <= ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdLte(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id <= ?", SysRoleId)) } -// XcxRoleIdNe is an autogenerated method +// SysRoleIdNe is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdNe(xcxRoleId uint32) UserQuerySet { - return qs.w(qs.db.Where("xcx_role_id != ?", xcxRoleId)) +func (qs UserQuerySet) SysRoleIdNe(SysRoleId uint32) UserQuerySet { + return qs.w(qs.db.Where("xcx_role_id != ?", SysRoleId)) } -// XcxRoleIdNotIn is an autogenerated method +// SysRoleIdNotIn is an autogenerated method // nolint: dupl -func (qs UserQuerySet) XcxRoleIdNotIn(xcxRoleId ...uint32) UserQuerySet { - if len(xcxRoleId) == 0 { - qs.db.AddError(errors.New("must at least pass one xcxRoleId in XcxRoleIdNotIn")) +func (qs UserQuerySet) SysRoleIdNotIn(SysRoleId ...uint32) UserQuerySet { + if len(SysRoleId) == 0 { + qs.db.AddError(errors.New("must at least pass one SysRoleId in SysRoleIdNotIn")) return qs.w(qs.db) } - return qs.w(qs.db.Where("xcx_role_id NOT IN (?)", xcxRoleId)) + return qs.w(qs.db.Where("xcx_role_id NOT IN (?)", SysRoleId)) } // SetAppOpenID is an autogenerated method @@ -15346,10 +15346,10 @@ func (u UserUpdater) SetWxUnionID(wxUnionID string) UserUpdater { return u } -// SetXcxRoleId is an autogenerated method +// SetSysRoleId is an autogenerated method // nolint: dupl -func (u UserUpdater) SetXcxRoleId(xcxRoleId uint32) UserUpdater { - u.fields[string(UserDBSchema.XcxRoleId)] = xcxRoleId +func (u UserUpdater) SetSysRoleId(SysRoleId uint32) UserUpdater { + u.fields[string(UserDBSchema.SysRoleId)] = SysRoleId return u } @@ -15403,7 +15403,7 @@ var UserDBSchema = struct { Country UserDBSchemaField Deposit UserDBSchemaField UserType UserDBSchemaField - XcxRoleId UserDBSchemaField + SysRoleId UserDBSchemaField OpenMemberChannel UserDBSchemaField StoreId UserDBSchemaField InviteCodeUrl UserDBSchemaField @@ -15443,7 +15443,7 @@ var UserDBSchema = struct { Country: UserDBSchemaField("country"), Deposit: UserDBSchemaField("deposit"), UserType: UserDBSchemaField("user_type"), - XcxRoleId: UserDBSchemaField("xcx_role_id"), + SysRoleId: UserDBSchemaField("xcx_role_id"), OpenMemberChannel: UserDBSchemaField("open_member_channel"), StoreId: UserDBSchemaField("store_id"), InviteCodeUrl: UserDBSchemaField("invite_code_url"), @@ -16444,25 +16444,25 @@ func NewUserRentCardUpdater(db *gorm.DB) UserRentCardUpdater { // ===== END of UserRentCard modifiers -// ===== BEGIN of query set XcxRoleQuerySet +// ===== BEGIN of query set SysRoleQuerySet -// XcxRoleQuerySet is an queryset type for XcxRole -type XcxRoleQuerySet struct { +// SysRoleQuerySet is an queryset type for SysRole +type SysRoleQuerySet struct { db *gorm.DB } -// NewXcxRoleQuerySet constructs new XcxRoleQuerySet -func NewXcxRoleQuerySet(db *gorm.DB) XcxRoleQuerySet { - return XcxRoleQuerySet{ - db: db.Model(&XcxRole{}), +// NewSysRoleQuerySet constructs new SysRoleQuerySet +func NewSysRoleQuerySet(db *gorm.DB) SysRoleQuerySet { + return SysRoleQuerySet{ + db: db.Model(&SysRole{}), } } -func (qs XcxRoleQuerySet) w(db *gorm.DB) XcxRoleQuerySet { - return NewXcxRoleQuerySet(db) +func (qs SysRoleQuerySet) w(db *gorm.DB) SysRoleQuerySet { + return NewSysRoleQuerySet(db) } -func (qs XcxRoleQuerySet) Select(fields ...XcxRoleDBSchemaField) XcxRoleQuerySet { +func (qs SysRoleQuerySet) Select(fields ...SysRoleDBSchemaField) SysRoleQuerySet { names := []string{} for _, f := range fields { names = append(names, f.String()) @@ -16473,25 +16473,25 @@ func (qs XcxRoleQuerySet) Select(fields ...XcxRoleDBSchemaField) XcxRoleQuerySet // Create is an autogenerated method // nolint: dupl -func (o *XcxRole) Create(db *gorm.DB) error { +func (o *SysRole) Create(db *gorm.DB) error { return db.Create(o).Error } // Delete is an autogenerated method // nolint: dupl -func (o *XcxRole) Delete(db *gorm.DB) error { +func (o *SysRole) Delete(db *gorm.DB) error { return db.Delete(o).Error } // All is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) All(ret *[]XcxRole) error { +func (qs SysRoleQuerySet) All(ret *[]SysRole) error { return qs.db.Find(ret).Error } // Count is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) Count() (int, error) { +func (qs SysRoleQuerySet) Count() (int, error) { var count int err := qs.db.Count(&count).Error return count, err @@ -16499,25 +16499,25 @@ func (qs XcxRoleQuerySet) Count() (int, error) { // CreateByEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByEq(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByEq(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by = ?", createBy)) } // CreateByGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByGt(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByGt(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by > ?", createBy)) } // CreateByGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByGte(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByGte(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by >= ?", createBy)) } // CreateByIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByIn(createBy ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByIn(createBy ...string) SysRoleQuerySet { if len(createBy) == 0 { qs.db.AddError(errors.New("must at least pass one createBy in CreateByIn")) return qs.w(qs.db) @@ -16527,31 +16527,31 @@ func (qs XcxRoleQuerySet) CreateByIn(createBy ...string) XcxRoleQuerySet { // CreateByLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByLike(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByLike(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by LIKE ?", createBy)) } // CreateByLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByLt(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByLt(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by < ?", createBy)) } // CreateByLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByLte(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByLte(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by <= ?", createBy)) } // CreateByNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByNe(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByNe(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by != ?", createBy)) } // CreateByNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByNotIn(createBy ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByNotIn(createBy ...string) SysRoleQuerySet { if len(createBy) == 0 { qs.db.AddError(errors.New("must at least pass one createBy in CreateByNotIn")) return qs.w(qs.db) @@ -16561,135 +16561,135 @@ func (qs XcxRoleQuerySet) CreateByNotIn(createBy ...string) XcxRoleQuerySet { // CreateByNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreateByNotlike(createBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreateByNotlike(createBy string) SysRoleQuerySet { return qs.w(qs.db.Where("create_by NOT LIKE ?", createBy)) } // CreatedAtEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtEq(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtEq(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at = ?", createdAt)) } // CreatedAtGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtGt(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtGt(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at > ?", createdAt)) } // CreatedAtGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtGte(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtGte(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at >= ?", createdAt)) } // CreatedAtLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtLt(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtLt(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at < ?", createdAt)) } // CreatedAtLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtLte(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtLte(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at <= ?", createdAt)) } // CreatedAtNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) CreatedAtNe(createdAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) CreatedAtNe(createdAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("created_at != ?", createdAt)) } // Delete is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) Delete() error { - return qs.db.Delete(XcxRole{}).Error +func (qs SysRoleQuerySet) Delete() error { + return qs.db.Delete(SysRole{}).Error } // DeleteNum is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeleteNum() (int64, error) { - db := qs.db.Delete(XcxRole{}) +func (qs SysRoleQuerySet) DeleteNum() (int64, error) { + db := qs.db.Delete(SysRole{}) return db.RowsAffected, db.Error } // DeleteNumUnscoped is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeleteNumUnscoped() (int64, error) { - db := qs.db.Unscoped().Delete(XcxRole{}) +func (qs SysRoleQuerySet) DeleteNumUnscoped() (int64, error) { + db := qs.db.Unscoped().Delete(SysRole{}) return db.RowsAffected, db.Error } // DeletedAtEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtEq(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtEq(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) } // DeletedAtGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtGt(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtGt(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) } // DeletedAtGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtGte(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtGte(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) } // DeletedAtIsNotNull is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtIsNotNull() XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtIsNotNull() SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at IS NOT NULL")) } // DeletedAtIsNull is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtIsNull() XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtIsNull() SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at IS NULL")) } // DeletedAtLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtLt(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtLt(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) } // DeletedAtLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtLte(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtLte(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) } // DeletedAtNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) DeletedAtNe(deletedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) DeletedAtNe(deletedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) } // FlagEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagEq(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagEq(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag = ?", flag)) } // FlagGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagGt(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagGt(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag > ?", flag)) } // FlagGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagGte(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagGte(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag >= ?", flag)) } // FlagIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagIn(flag ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagIn(flag ...string) SysRoleQuerySet { if len(flag) == 0 { qs.db.AddError(errors.New("must at least pass one flag in FlagIn")) return qs.w(qs.db) @@ -16699,31 +16699,31 @@ func (qs XcxRoleQuerySet) FlagIn(flag ...string) XcxRoleQuerySet { // FlagLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagLike(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagLike(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag LIKE ?", flag)) } // FlagLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagLt(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagLt(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag < ?", flag)) } // FlagLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagLte(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagLte(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag <= ?", flag)) } // FlagNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagNe(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagNe(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag != ?", flag)) } // FlagNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagNotIn(flag ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagNotIn(flag ...string) SysRoleQuerySet { if len(flag) == 0 { qs.db.AddError(errors.New("must at least pass one flag in FlagNotIn")) return qs.w(qs.db) @@ -16733,273 +16733,277 @@ func (qs XcxRoleQuerySet) FlagNotIn(flag ...string) XcxRoleQuerySet { // FlagNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) FlagNotlike(flag string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) FlagNotlike(flag string) SysRoleQuerySet { return qs.w(qs.db.Where("flag NOT LIKE ?", flag)) } // GetDB is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) GetDB() *gorm.DB { +func (qs SysRoleQuerySet) GetDB() *gorm.DB { return qs.db } // GetUpdater is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) GetUpdater() XcxRoleUpdater { - return NewXcxRoleUpdater(qs.db) +func (qs SysRoleQuerySet) GetUpdater() SysRoleUpdater { + return NewSysRoleUpdater(qs.db) } // IDEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDEq(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id = ?", ID)) +func (qs SysRoleQuerySet) IDEq(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id = ?", ID)) } // IDGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDGt(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id > ?", ID)) +func (qs SysRoleQuerySet) IDGt(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id > ?", ID)) } // IDGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDGte(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id >= ?", ID)) +func (qs SysRoleQuerySet) IDGte(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id >= ?", ID)) } // IDIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDIn(ID ...uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) IDIn(ID ...uint32) SysRoleQuerySet { if len(ID) == 0 { qs.db.AddError(errors.New("must at least pass one ID in IDIn")) return qs.w(qs.db) } - return qs.w(qs.db.Where("id IN (?)", ID)) + return qs.w(qs.db.Where("role_id IN (?)", ID)) } // IDLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDLt(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id < ?", ID)) +func (qs SysRoleQuerySet) IDLt(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id < ?", ID)) } // IDLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDLte(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id <= ?", ID)) +func (qs SysRoleQuerySet) IDLte(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id <= ?", ID)) } // IDNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDNe(ID uint32) XcxRoleQuerySet { - return qs.w(qs.db.Where("id != ?", ID)) +func (qs SysRoleQuerySet) IDNe(ID uint32) SysRoleQuerySet { + return qs.w(qs.db.Where("role_id != ?", ID)) } // IDNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) IDNotIn(ID ...uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) IDNotIn(ID ...uint32) SysRoleQuerySet { if len(ID) == 0 { qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) return qs.w(qs.db) } - return qs.w(qs.db.Where("id NOT IN (?)", ID)) + return qs.w(qs.db.Where("role_id NOT IN (?)", ID)) } // Limit is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) Limit(limit int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) Limit(limit int) SysRoleQuerySet { return qs.w(qs.db.Limit(limit)) } // Offset is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) Offset(offset int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) Offset(offset int) SysRoleQuerySet { return qs.w(qs.db.Offset(offset)) } +func (qs SysRoleQuerySet) Find(ret *SysRole) error { + return qs.db.Find(ret).Error +} + // One is used to retrieve one result. It returns gorm.ErrRecordNotFound // if nothing was fetched -func (qs XcxRoleQuerySet) One(ret *XcxRole) error { +func (qs SysRoleQuerySet) One(ret *SysRole) error { return qs.db.First(ret).Error } // OrderAscByCreateBy is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByCreateBy() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByCreateBy() SysRoleQuerySet { return qs.w(qs.db.Order("create_by ASC")) } // OrderAscByCreatedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByCreatedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByCreatedAt() SysRoleQuerySet { return qs.w(qs.db.Order("created_at ASC")) } // OrderAscByDeletedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByDeletedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByDeletedAt() SysRoleQuerySet { return qs.w(qs.db.Order("deleted_at ASC")) } // OrderAscByFlag is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByFlag() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByFlag() SysRoleQuerySet { return qs.w(qs.db.Order("flag ASC")) } // OrderAscByID is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByID() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByID() SysRoleQuerySet { return qs.w(qs.db.Order("id ASC")) } // OrderAscByRemark is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByRemark() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByRemark() SysRoleQuerySet { return qs.w(qs.db.Order("remark ASC")) } // OrderAscByRoleId is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByRoleId() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByRoleId() SysRoleQuerySet { return qs.w(qs.db.Order("role_id ASC")) } // OrderAscByRoleKey is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByRoleKey() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByRoleKey() SysRoleQuerySet { return qs.w(qs.db.Order("role_key ASC")) } // OrderAscByRoleName is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByRoleName() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByRoleName() SysRoleQuerySet { return qs.w(qs.db.Order("role_name ASC")) } // OrderAscByRoleSort is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByRoleSort() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByRoleSort() SysRoleQuerySet { return qs.w(qs.db.Order("role_sort ASC")) } // OrderAscByStatus is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByStatus() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByStatus() SysRoleQuerySet { return qs.w(qs.db.Order("status ASC")) } // OrderAscByUpdateBy is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByUpdateBy() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByUpdateBy() SysRoleQuerySet { return qs.w(qs.db.Order("update_by ASC")) } // OrderAscByUpdatedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderAscByUpdatedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderAscByUpdatedAt() SysRoleQuerySet { return qs.w(qs.db.Order("updated_at ASC")) } // OrderDescByCreateBy is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByCreateBy() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByCreateBy() SysRoleQuerySet { return qs.w(qs.db.Order("create_by DESC")) } // OrderDescByCreatedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByCreatedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByCreatedAt() SysRoleQuerySet { return qs.w(qs.db.Order("created_at DESC")) } // OrderDescByDeletedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByDeletedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByDeletedAt() SysRoleQuerySet { return qs.w(qs.db.Order("deleted_at DESC")) } // OrderDescByFlag is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByFlag() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByFlag() SysRoleQuerySet { return qs.w(qs.db.Order("flag DESC")) } // OrderDescByID is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByID() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByID() SysRoleQuerySet { return qs.w(qs.db.Order("id DESC")) } // OrderDescByRemark is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByRemark() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByRemark() SysRoleQuerySet { return qs.w(qs.db.Order("remark DESC")) } // OrderDescByRoleId is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByRoleId() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByRoleId() SysRoleQuerySet { return qs.w(qs.db.Order("role_id DESC")) } // OrderDescByRoleKey is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByRoleKey() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByRoleKey() SysRoleQuerySet { return qs.w(qs.db.Order("role_key DESC")) } // OrderDescByRoleName is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByRoleName() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByRoleName() SysRoleQuerySet { return qs.w(qs.db.Order("role_name DESC")) } // OrderDescByRoleSort is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByRoleSort() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByRoleSort() SysRoleQuerySet { return qs.w(qs.db.Order("role_sort DESC")) } // OrderDescByStatus is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByStatus() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByStatus() SysRoleQuerySet { return qs.w(qs.db.Order("status DESC")) } // OrderDescByUpdateBy is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByUpdateBy() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByUpdateBy() SysRoleQuerySet { return qs.w(qs.db.Order("update_by DESC")) } // OrderDescByUpdatedAt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) OrderDescByUpdatedAt() XcxRoleQuerySet { +func (qs SysRoleQuerySet) OrderDescByUpdatedAt() SysRoleQuerySet { return qs.w(qs.db.Order("updated_at DESC")) } // RemarkEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkEq(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkEq(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark = ?", remark)) } // RemarkGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkGt(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkGt(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark > ?", remark)) } // RemarkGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkGte(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkGte(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark >= ?", remark)) } // RemarkIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkIn(remark ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkIn(remark ...string) SysRoleQuerySet { if len(remark) == 0 { qs.db.AddError(errors.New("must at least pass one remark in RemarkIn")) return qs.w(qs.db) @@ -17009,31 +17013,31 @@ func (qs XcxRoleQuerySet) RemarkIn(remark ...string) XcxRoleQuerySet { // RemarkLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkLike(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkLike(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark LIKE ?", remark)) } // RemarkLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkLt(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkLt(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark < ?", remark)) } // RemarkLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkLte(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkLte(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark <= ?", remark)) } // RemarkNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkNe(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkNe(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark != ?", remark)) } // RemarkNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkNotIn(remark ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkNotIn(remark ...string) SysRoleQuerySet { if len(remark) == 0 { qs.db.AddError(errors.New("must at least pass one remark in RemarkNotIn")) return qs.w(qs.db) @@ -17043,31 +17047,31 @@ func (qs XcxRoleQuerySet) RemarkNotIn(remark ...string) XcxRoleQuerySet { // RemarkNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RemarkNotlike(remark string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RemarkNotlike(remark string) SysRoleQuerySet { return qs.w(qs.db.Where("remark NOT LIKE ?", remark)) } // RoleIdEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdEq(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdEq(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id = ?", roleId)) } // RoleIdGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdGt(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdGt(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id > ?", roleId)) } // RoleIdGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdGte(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdGte(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id >= ?", roleId)) } // RoleIdIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdIn(roleId ...uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdIn(roleId ...uint32) SysRoleQuerySet { if len(roleId) == 0 { qs.db.AddError(errors.New("must at least pass one roleId in RoleIdIn")) return qs.w(qs.db) @@ -17077,25 +17081,25 @@ func (qs XcxRoleQuerySet) RoleIdIn(roleId ...uint32) XcxRoleQuerySet { // RoleIdLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdLt(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdLt(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id < ?", roleId)) } // RoleIdLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdLte(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdLte(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id <= ?", roleId)) } // RoleIdNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdNe(roleId uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdNe(roleId uint32) SysRoleQuerySet { return qs.w(qs.db.Where("role_id != ?", roleId)) } // RoleIdNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleIdNotIn(roleId ...uint32) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleIdNotIn(roleId ...uint32) SysRoleQuerySet { if len(roleId) == 0 { qs.db.AddError(errors.New("must at least pass one roleId in RoleIdNotIn")) return qs.w(qs.db) @@ -17105,25 +17109,25 @@ func (qs XcxRoleQuerySet) RoleIdNotIn(roleId ...uint32) XcxRoleQuerySet { // RoleKeyEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyEq(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyEq(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key = ?", roleKey)) } // RoleKeyGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyGt(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyGt(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key > ?", roleKey)) } // RoleKeyGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyGte(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyGte(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key >= ?", roleKey)) } // RoleKeyIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyIn(roleKey ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyIn(roleKey ...string) SysRoleQuerySet { if len(roleKey) == 0 { qs.db.AddError(errors.New("must at least pass one roleKey in RoleKeyIn")) return qs.w(qs.db) @@ -17133,31 +17137,31 @@ func (qs XcxRoleQuerySet) RoleKeyIn(roleKey ...string) XcxRoleQuerySet { // RoleKeyLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyLike(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyLike(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key LIKE ?", roleKey)) } // RoleKeyLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyLt(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyLt(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key < ?", roleKey)) } // RoleKeyLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyLte(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyLte(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key <= ?", roleKey)) } // RoleKeyNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyNe(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyNe(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key != ?", roleKey)) } // RoleKeyNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyNotIn(roleKey ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyNotIn(roleKey ...string) SysRoleQuerySet { if len(roleKey) == 0 { qs.db.AddError(errors.New("must at least pass one roleKey in RoleKeyNotIn")) return qs.w(qs.db) @@ -17167,31 +17171,31 @@ func (qs XcxRoleQuerySet) RoleKeyNotIn(roleKey ...string) XcxRoleQuerySet { // RoleKeyNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleKeyNotlike(roleKey string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleKeyNotlike(roleKey string) SysRoleQuerySet { return qs.w(qs.db.Where("role_key NOT LIKE ?", roleKey)) } // RoleNameEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameEq(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameEq(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name = ?", roleName)) } // RoleNameGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameGt(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameGt(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name > ?", roleName)) } // RoleNameGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameGte(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameGte(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name >= ?", roleName)) } // RoleNameIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameIn(roleName ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameIn(roleName ...string) SysRoleQuerySet { if len(roleName) == 0 { qs.db.AddError(errors.New("must at least pass one roleName in RoleNameIn")) return qs.w(qs.db) @@ -17201,31 +17205,31 @@ func (qs XcxRoleQuerySet) RoleNameIn(roleName ...string) XcxRoleQuerySet { // RoleNameLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameLike(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameLike(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name LIKE ?", roleName)) } // RoleNameLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameLt(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameLt(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name < ?", roleName)) } // RoleNameLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameLte(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameLte(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name <= ?", roleName)) } // RoleNameNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameNe(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameNe(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name != ?", roleName)) } // RoleNameNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameNotIn(roleName ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameNotIn(roleName ...string) SysRoleQuerySet { if len(roleName) == 0 { qs.db.AddError(errors.New("must at least pass one roleName in RoleNameNotIn")) return qs.w(qs.db) @@ -17235,31 +17239,31 @@ func (qs XcxRoleQuerySet) RoleNameNotIn(roleName ...string) XcxRoleQuerySet { // RoleNameNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleNameNotlike(roleName string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleNameNotlike(roleName string) SysRoleQuerySet { return qs.w(qs.db.Where("role_name NOT LIKE ?", roleName)) } // RoleSortEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortEq(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortEq(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort = ?", roleSort)) } // RoleSortGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortGt(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortGt(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort > ?", roleSort)) } // RoleSortGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortGte(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortGte(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort >= ?", roleSort)) } // RoleSortIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortIn(roleSort ...int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortIn(roleSort ...int) SysRoleQuerySet { if len(roleSort) == 0 { qs.db.AddError(errors.New("must at least pass one roleSort in RoleSortIn")) return qs.w(qs.db) @@ -17269,25 +17273,25 @@ func (qs XcxRoleQuerySet) RoleSortIn(roleSort ...int) XcxRoleQuerySet { // RoleSortLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortLt(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortLt(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort < ?", roleSort)) } // RoleSortLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortLte(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortLte(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort <= ?", roleSort)) } // RoleSortNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortNe(roleSort int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortNe(roleSort int) SysRoleQuerySet { return qs.w(qs.db.Where("role_sort != ?", roleSort)) } // RoleSortNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) RoleSortNotIn(roleSort ...int) XcxRoleQuerySet { +func (qs SysRoleQuerySet) RoleSortNotIn(roleSort ...int) SysRoleQuerySet { if len(roleSort) == 0 { qs.db.AddError(errors.New("must at least pass one roleSort in RoleSortNotIn")) return qs.w(qs.db) @@ -17297,25 +17301,25 @@ func (qs XcxRoleQuerySet) RoleSortNotIn(roleSort ...int) XcxRoleQuerySet { // StatusEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusEq(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusEq(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status = ?", status)) } // StatusGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusGt(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusGt(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status > ?", status)) } // StatusGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusGte(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusGte(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status >= ?", status)) } // StatusIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusIn(status ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusIn(status ...string) SysRoleQuerySet { if len(status) == 0 { qs.db.AddError(errors.New("must at least pass one status in StatusIn")) return qs.w(qs.db) @@ -17325,31 +17329,31 @@ func (qs XcxRoleQuerySet) StatusIn(status ...string) XcxRoleQuerySet { // StatusLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusLike(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusLike(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status LIKE ?", status)) } // StatusLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusLt(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusLt(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status < ?", status)) } // StatusLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusLte(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusLte(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status <= ?", status)) } // StatusNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusNe(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusNe(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status != ?", status)) } // StatusNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusNotIn(status ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusNotIn(status ...string) SysRoleQuerySet { if len(status) == 0 { qs.db.AddError(errors.New("must at least pass one status in StatusNotIn")) return qs.w(qs.db) @@ -17359,31 +17363,31 @@ func (qs XcxRoleQuerySet) StatusNotIn(status ...string) XcxRoleQuerySet { // StatusNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) StatusNotlike(status string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) StatusNotlike(status string) SysRoleQuerySet { return qs.w(qs.db.Where("status NOT LIKE ?", status)) } // UpdateByEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByEq(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByEq(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by = ?", updateBy)) } // UpdateByGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByGt(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByGt(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by > ?", updateBy)) } // UpdateByGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByGte(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByGte(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by >= ?", updateBy)) } // UpdateByIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByIn(updateBy ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByIn(updateBy ...string) SysRoleQuerySet { if len(updateBy) == 0 { qs.db.AddError(errors.New("must at least pass one updateBy in UpdateByIn")) return qs.w(qs.db) @@ -17393,31 +17397,31 @@ func (qs XcxRoleQuerySet) UpdateByIn(updateBy ...string) XcxRoleQuerySet { // UpdateByLike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByLike(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByLike(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by LIKE ?", updateBy)) } // UpdateByLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByLt(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByLt(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by < ?", updateBy)) } // UpdateByLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByLte(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByLte(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by <= ?", updateBy)) } // UpdateByNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByNe(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByNe(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by != ?", updateBy)) } // UpdateByNotIn is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByNotIn(updateBy ...string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByNotIn(updateBy ...string) SysRoleQuerySet { if len(updateBy) == 0 { qs.db.AddError(errors.New("must at least pass one updateBy in UpdateByNotIn")) return qs.w(qs.db) @@ -17427,198 +17431,198 @@ func (qs XcxRoleQuerySet) UpdateByNotIn(updateBy ...string) XcxRoleQuerySet { // UpdateByNotlike is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdateByNotlike(updateBy string) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdateByNotlike(updateBy string) SysRoleQuerySet { return qs.w(qs.db.Where("update_by NOT LIKE ?", updateBy)) } // UpdatedAtEq is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtEq(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtEq(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at = ?", updatedAt)) } // UpdatedAtGt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtGt(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtGt(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at > ?", updatedAt)) } // UpdatedAtGte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtGte(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtGte(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) } // UpdatedAtLt is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtLt(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtLt(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at < ?", updatedAt)) } // UpdatedAtLte is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtLte(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtLte(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) } // UpdatedAtNe is an autogenerated method // nolint: dupl -func (qs XcxRoleQuerySet) UpdatedAtNe(updatedAt time.Time) XcxRoleQuerySet { +func (qs SysRoleQuerySet) UpdatedAtNe(updatedAt time.Time) SysRoleQuerySet { return qs.w(qs.db.Where("updated_at != ?", updatedAt)) } // SetCreateBy is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetCreateBy(createBy string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.CreateBy)] = createBy +func (u SysRoleUpdater) SetCreateBy(createBy string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.CreateBy)] = createBy return u } // SetCreatedAt is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetCreatedAt(createdAt time.Time) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.CreatedAt)] = createdAt +func (u SysRoleUpdater) SetCreatedAt(createdAt time.Time) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.CreatedAt)] = createdAt return u } // SetDeletedAt is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetDeletedAt(deletedAt *time.Time) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.DeletedAt)] = deletedAt +func (u SysRoleUpdater) SetDeletedAt(deletedAt *time.Time) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.DeletedAt)] = deletedAt return u } // SetFlag is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetFlag(flag string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.Flag)] = flag +func (u SysRoleUpdater) SetFlag(flag string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.Flag)] = flag return u } // SetID is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetID(ID uint32) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.ID)] = ID +func (u SysRoleUpdater) SetID(ID uint32) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.ID)] = ID return u } // SetRemark is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetRemark(remark string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.Remark)] = remark +func (u SysRoleUpdater) SetRemark(remark string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.Remark)] = remark return u } // SetRoleId is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetRoleId(roleId uint32) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.RoleId)] = roleId +func (u SysRoleUpdater) SetRoleId(roleId uint32) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.RoleId)] = roleId return u } // SetRoleKey is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetRoleKey(roleKey string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.RoleKey)] = roleKey +func (u SysRoleUpdater) SetRoleKey(roleKey string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.RoleKey)] = roleKey return u } // SetRoleName is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetRoleName(roleName string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.RoleName)] = roleName +func (u SysRoleUpdater) SetRoleName(roleName string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.RoleName)] = roleName return u } // SetRoleSort is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetRoleSort(roleSort int) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.RoleSort)] = roleSort +func (u SysRoleUpdater) SetRoleSort(roleSort int) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.RoleSort)] = roleSort return u } // SetStatus is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetStatus(status string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.Status)] = status +func (u SysRoleUpdater) SetStatus(status string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.Status)] = status return u } // SetUpdateBy is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetUpdateBy(updateBy string) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.UpdateBy)] = updateBy +func (u SysRoleUpdater) SetUpdateBy(updateBy string) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.UpdateBy)] = updateBy return u } // SetUpdatedAt is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) SetUpdatedAt(updatedAt time.Time) XcxRoleUpdater { - u.fields[string(XcxRoleDBSchema.UpdatedAt)] = updatedAt +func (u SysRoleUpdater) SetUpdatedAt(updatedAt time.Time) SysRoleUpdater { + u.fields[string(SysRoleDBSchema.UpdatedAt)] = updatedAt return u } // Update is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) Update() error { +func (u SysRoleUpdater) Update() error { return u.db.Updates(u.fields).Error } // UpdateNum is an autogenerated method // nolint: dupl -func (u XcxRoleUpdater) UpdateNum() (int64, error) { +func (u SysRoleUpdater) UpdateNum() (int64, error) { db := u.db.Updates(u.fields) return db.RowsAffected, db.Error } -// ===== END of query set XcxRoleQuerySet +// ===== END of query set SysRoleQuerySet -// ===== BEGIN of XcxRole modifiers +// ===== BEGIN of SysRole modifiers -// XcxRoleDBSchemaField describes database schema field. It requires for method 'Update' -type XcxRoleDBSchemaField string +// SysRoleDBSchemaField describes database schema field. It requires for method 'Update' +type SysRoleDBSchemaField string // String method returns string representation of field. // nolint: dupl -func (f XcxRoleDBSchemaField) String() string { +func (f SysRoleDBSchemaField) String() string { return string(f) } -// XcxRoleDBSchema stores db field names of XcxRole -var XcxRoleDBSchema = struct { - ID XcxRoleDBSchemaField - CreatedAt XcxRoleDBSchemaField - UpdatedAt XcxRoleDBSchemaField - DeletedAt XcxRoleDBSchemaField - RoleId XcxRoleDBSchemaField - RoleName XcxRoleDBSchemaField - RoleKey XcxRoleDBSchemaField - RoleSort XcxRoleDBSchemaField - Status XcxRoleDBSchemaField - Flag XcxRoleDBSchemaField - CreateBy XcxRoleDBSchemaField - UpdateBy XcxRoleDBSchemaField - Remark XcxRoleDBSchemaField +// SysRoleDBSchema stores db field names of SysRole +var SysRoleDBSchema = struct { + ID SysRoleDBSchemaField + CreatedAt SysRoleDBSchemaField + UpdatedAt SysRoleDBSchemaField + DeletedAt SysRoleDBSchemaField + RoleId SysRoleDBSchemaField + RoleName SysRoleDBSchemaField + RoleKey SysRoleDBSchemaField + RoleSort SysRoleDBSchemaField + Status SysRoleDBSchemaField + Flag SysRoleDBSchemaField + CreateBy SysRoleDBSchemaField + UpdateBy SysRoleDBSchemaField + Remark SysRoleDBSchemaField }{ - ID: XcxRoleDBSchemaField("id"), - CreatedAt: XcxRoleDBSchemaField("created_at"), - UpdatedAt: XcxRoleDBSchemaField("updated_at"), - DeletedAt: XcxRoleDBSchemaField("deleted_at"), - RoleId: XcxRoleDBSchemaField("role_id"), - RoleName: XcxRoleDBSchemaField("role_name"), - RoleKey: XcxRoleDBSchemaField("role_key"), - RoleSort: XcxRoleDBSchemaField("role_sort"), - Status: XcxRoleDBSchemaField("status"), - Flag: XcxRoleDBSchemaField("flag"), - CreateBy: XcxRoleDBSchemaField("create_by"), - UpdateBy: XcxRoleDBSchemaField("update_by"), - Remark: XcxRoleDBSchemaField("remark"), + ID: SysRoleDBSchemaField("id"), + CreatedAt: SysRoleDBSchemaField("created_at"), + UpdatedAt: SysRoleDBSchemaField("updated_at"), + DeletedAt: SysRoleDBSchemaField("deleted_at"), + RoleId: SysRoleDBSchemaField("role_id"), + RoleName: SysRoleDBSchemaField("role_name"), + RoleKey: SysRoleDBSchemaField("role_key"), + RoleSort: SysRoleDBSchemaField("role_sort"), + Status: SysRoleDBSchemaField("status"), + Flag: SysRoleDBSchemaField("flag"), + CreateBy: SysRoleDBSchemaField("create_by"), + UpdateBy: SysRoleDBSchemaField("update_by"), + Remark: SysRoleDBSchemaField("remark"), } -// Update updates XcxRole fields by primary key +// Update updates SysRole fields by primary key // nolint: dupl -func (o *XcxRole) Update(db *gorm.DB, fields ...XcxRoleDBSchemaField) error { +func (o *SysRole) Update(db *gorm.DB, fields ...SysRoleDBSchemaField) error { dbNameToFieldName := map[string]interface{}{ "id": o.ID, "created_at": o.CreatedAt, @@ -17644,28 +17648,28 @@ func (o *XcxRole) Update(db *gorm.DB, fields ...XcxRoleDBSchemaField) error { return err } - return fmt.Errorf("can't update XcxRole %v fields %v: %s", + return fmt.Errorf("can't update SysRole %v fields %v: %s", o, fields, err) } return nil } -// XcxRoleUpdater is an XcxRole updates manager -type XcxRoleUpdater struct { +// SysRoleUpdater is an SysRole updates manager +type SysRoleUpdater struct { fields map[string]interface{} db *gorm.DB } -// NewXcxRoleUpdater creates new XcxRole updater +// NewSysRoleUpdater creates new SysRole updater // nolint: dupl -func NewXcxRoleUpdater(db *gorm.DB) XcxRoleUpdater { - return XcxRoleUpdater{ +func NewSysRoleUpdater(db *gorm.DB) SysRoleUpdater { + return SysRoleUpdater{ fields: map[string]interface{}{}, - db: db.Model(&XcxRole{}), + db: db.Model(&SysRole{}), } } -// ===== END of XcxRole modifiers +// ===== END of SysRole modifiers // ===== END of all query sets diff --git a/model/model_test.go b/model/model_test.go index 6909b6f..6d40e2c 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -1277,21 +1277,21 @@ func AddMemberPromotion() { } func TestXcxRoleAdd(t *testing.T) { - InitTestDB() - role := &XcxRole{ - RoleName: "店长", - RoleKey: "shop_manager", - RoleSort: 2, - Status: "normal", - Flag: "", - CreateBy: "", - UpdateBy: "", - Remark: "", - } - err := DBDev.Create(role).Error - if err != nil { - logger.Error("err:") - } + //InitTestDB() + //role := &XcxRole{ + // RoleName: "店长", + // RoleKey: "shop_manager", + // RoleSort: 2, + // Status: "normal", + // Flag: "", + // CreateBy: "", + // UpdateBy: "", + // Remark: "", + //} + //err := DBDev.Create(role).Error + //if err != nil { + // logger.Error("err:") + //} // assistant //shop_manager 长 } diff --git a/model/user.go b/model/user.go index 4594ce9..f2f6b1d 100644 --- a/model/user.go +++ b/model/user.go @@ -58,6 +58,7 @@ type User struct { DepositType uint32 `json:"deposit_type"` // 押金类型: 3-未充值 StoreList []StoreInfo `gorm:"-" json:"store_list"` // 有效门店列表 RoleId uint32 `json:"role_id" gorm:"-"` // 角色id + RoleKey string `json:"role_key" gorm:"-"` // 角色代码 //RenewalTime time.Time `json:"renewal_time"` //RenewalMemberLevel uint32 `json:"renewal_member_level"` //MemberLevelString string `json:"member_level_string" gorm:"-"` // 会员类型 @@ -221,24 +222,44 @@ type UserMemberExpireDelay struct { IsPay uint32 `json:"is_pay"` // 1-已支付 } -// gen:qs -type XcxRole struct { +// gen:gs +type SysRole struct { Model - RoleId uint32 `json:"role_id" gorm:"unique_index,not null"` - RoleName string `json:"role_name" gorm:"size:255;"` // 角色名称 - RoleKey string `json:"role_key" gorm:"size:255;"` // 角色代码 - RoleSort int `json:"role_sort" gorm:""` // 角色排序 - Status string `json:"status" gorm:"size:255;"` // 状态:1-停用 2-正常 - Flag string `json:"flag" gorm:"size:255;"` // - CreateBy string `json:"create_by" gorm:"size:255;"` // - UpdateBy string `json:"update_by" gorm:"size:255;"` // - Remark string `json:"remark" gorm:"size:255;"` // 备注 + RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码 + RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 + Status string `json:"status" gorm:"size:4;"` // + RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 + RoleSort int `json:"roleSort" gorm:""` //角色排序 + Flag string `json:"flag" gorm:"size:128;"` // + CreateBy string `json:"createBy" gorm:"size:128;"` // + UpdateBy string `json:"updateBy" gorm:"size:128;"` // + Remark string `json:"remark" gorm:"size:255;"` //备注 + Admin bool `json:"admin" gorm:"size:4;"` + DataScope string `json:"dataScope" gorm:"size:128;"` Params string `json:"params" gorm:"-"` MenuIds []int `json:"menuIds" gorm:"-"` DeptIds []int `json:"deptIds" gorm:"-"` } +//// gen:qs +//type XcxRole struct { +// Model +// RoleId uint32 `json:"role_id" gorm:"unique_index,not null"` +// RoleName string `json:"role_name" gorm:"size:255;"` // 角色名称 +// RoleKey string `json:"role_key" gorm:"size:255;"` // 角色代码 +// RoleSort int `json:"role_sort" gorm:""` // 角色排序 +// Status string `json:"status" gorm:"size:255;"` // 状态:1-停用 2-正常 +// Flag string `json:"flag" gorm:"size:255;"` // +// CreateBy string `json:"create_by" gorm:"size:255;"` // +// UpdateBy string `json:"update_by" gorm:"size:255;"` // +// Remark string `json:"remark" gorm:"size:255;"` // 备注 +// +// Params string `json:"params" gorm:"-"` +// MenuIds []int `json:"menuIds" gorm:"-"` +// DeptIds []int `json:"deptIds" gorm:"-"` +//} + // gen:qs // ShopperPromotionCode 店员优惠码 type ShopperPromotionCode struct { diff --git a/pack/configs/dev/server.json b/pack/configs/dev/server.json index 0d0ed66..98af85e 100644 --- a/pack/configs/dev/server.json +++ b/pack/configs/dev/server.json @@ -23,11 +23,11 @@ }, "db": { "driver": "mysql", - "host": "39.108.188.218", + "host": "112.33.14.191", "port": 3306, - "user": "mh_new_pro", - "password": "YnzexdTfBHMSGZki", - "db_name": "mh_new_pro" + "user": "mh_dev", + "password": "d9qy46ONI0ZTF9eH", + "db_name": "mh_dev" }, "wx": { "app_id": "wx806c079463b5b56c",