From 31b36bc41354510660d9abb75e998cfeb1f34986 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 10 Mar 2021 15:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20close?= =?UTF-8?q?=20#367?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/system/sys_user.go | 4 ++-- app/admin/service/sys_user.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 {