From 8f1e1b15d0163e8d4e75697fd2494537fd9a1a48 Mon Sep 17 00:00:00 2001 From: chenlin Date: Wed, 24 Jul 2024 14:32:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BC=96=E8=BE=91=E6=97=B6=E4=BC=9A=E6=8A=8A=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=BD=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/system/sysuser.go | 7 +++++++ app/admin/models/sysuser.go | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/admin/apis/system/sysuser.go b/app/admin/apis/system/sysuser.go index 868cd07..1a2d42a 100644 --- a/app/admin/apis/system/sysuser.go +++ b/app/admin/apis/system/sysuser.go @@ -403,6 +403,13 @@ func UpdateSysUser(c *gin.Context) { Uid: req.Uid, }, } + if req.LoginM.UserName.Username == "" { + data.LoginM.UserName = sysInfo.LoginM.UserName + } + + if req.LoginM.PassWord.Password == "" { + data.LoginM.PassWord = sysInfo.LoginM.PassWord + } if len(req.StoreList) != 0 { // 将 StoreData 转换为 JSON 字符串 diff --git a/app/admin/models/sysuser.go b/app/admin/models/sysuser.go index b80fa7d..382b55a 100644 --- a/app/admin/models/sysuser.go +++ b/app/admin/models/sysuser.go @@ -630,8 +630,8 @@ func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) { return } -func GetUserById(id uint32) *SysUserB { - var u = new(SysUserB) +func GetUserById(id uint32) *SysUser { + var u = new(SysUser) orm.Eloquent.Table("sys_user").Where("user_id", id).First(u) return u @@ -811,7 +811,7 @@ func AddShopperCode(req InsertSysUserReq, begin *gorm.DB) error { } // UpdateShopperCode 更新店员兑换码 -func UpdateShopperCode(req InsertSysUserReq, begin *gorm.DB, sysInfo *SysUserB) error { +func UpdateShopperCode(req InsertSysUserReq, begin *gorm.DB, sysInfo *SysUser) error { if req.Uid == sysInfo.Uid && req.ShopperCode == sysInfo.ShopperCode { // 兑换码没变化 return nil }