diff --git a/app/admin/models/system/sys_user.go b/app/admin/models/system/sys_user.go index 57291c1..f866bde 100644 --- a/app/admin/models/system/sys_user.go +++ b/app/admin/models/system/sys_user.go @@ -11,11 +11,11 @@ type SysUser struct { models.ModelTime UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` - Password string `json:"password" gorm:"type:varchar(128);comment:密码"` + Password string `json:"-" gorm:"type:varchar(128);comment:密码"` NickName string `json:"nickName" gorm:"type:varchar(128);comment:昵称"` Phone string `json:"phone" gorm:"type:varchar(11);comment:手机号"` RoleId int `json:"roleId" gorm:"type:bigint(20);comment:角色ID"` - Salt string `json:"salt" gorm:"type:varchar(255);comment:加盐"` + Salt string `json:"-" gorm:"type:varchar(255);comment:加盐"` Avatar string `json:"avatar" gorm:"type:varchar(255);comment:头像"` Sex string `json:"sex" gorm:"type:varchar(255);comment:性别"` Email string `json:"email" gorm:"type:varchar(128);comment:邮箱"` diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index 87ad4bd..edbd2af 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -27,6 +27,7 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list * cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), actions.Permission(data.TableName(), p), ). + Preload("Dept"). Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil {