From 41d8daac97acef0e2099a8a13cfc38e1b8283f6f Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Wed, 14 Jul 2021 11:13:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=B6=E5=AE=83=E4=BF=A1=E6=81=AF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=A2=AB=E7=BD=AE=E7=A9=BA=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=20#484?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_user.go | 32 +++++++++++++++---------------- app/admin/service/sys_user.go | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 29ac8e0f..6d6a206e 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -72,8 +72,8 @@ func (s *UpdateSysUserAvatarReq) Generate(model *models.SysUser) { } type UpdateSysUserStatusReq struct { - UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID - Status string `json:"status" comment:"状态" binding:"required"` + UserId int `json:"userId" comment:"用户ID" vd:"required"` // 用户ID + Status string `json:"status" comment:"状态" vd:"required"` common.ControlBy } @@ -90,18 +90,18 @@ func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) { type SysUserInsertReq struct { UserId int `json:"userId" comment:"用户ID"` // 用户ID - Username string `json:"username" comment:"用户名" binding:"required"` + Username string `json:"username" comment:"用户名" vd:"required"` Password string `json:"password" comment:"密码"` - NickName string `json:"nickName" comment:"昵称" binding:"required"` - Phone string `json:"phone" comment:"手机号" binding:"required"` + NickName string `json:"nickName" comment:"昵称" vd:"required"` + Phone string `json:"phone" comment:"手机号" vd:"required"` RoleId int `json:"roleId" comment:"角色ID"` Avatar string `json:"avatar" comment:"头像"` Sex string `json:"sex" comment:"性别"` - Email string `json:"email" comment:"邮箱" binding:"required,email"` - DeptId int `json:"deptId" comment:"部门" binding:"required"` + Email string `json:"email" comment:"邮箱" vd:"required,email"` + DeptId int `json:"deptId" comment:"部门" vd:"required"` PostId int `json:"postId" comment:"岗位"` Remark string `json:"remark" comment:"备注"` - Status string `json:"status" comment:"状态" binding:"required" default:"1"` + Status string `json:"status" comment:"状态" vd:"required" default:"1"` common.ControlBy } @@ -129,17 +129,17 @@ func (s *SysUserInsertReq) GetId() interface{} { type SysUserUpdateReq struct { UserId int `json:"userId" comment:"用户ID"` // 用户ID - Username string `json:"username" comment:"用户名" binding:"required"` - NickName string `json:"nickName" comment:"昵称" binding:"required"` - Phone string `json:"phone" comment:"手机号" binding:"required"` + Username string `json:"username" comment:"用户名" vd:"required"` + NickName string `json:"nickName" comment:"昵称" vd:"required"` + Phone string `json:"phone" comment:"手机号" vd:"required"` RoleId int `json:"roleId" comment:"角色ID"` Avatar string `json:"avatar" comment:"头像"` Sex string `json:"sex" comment:"性别"` - Email string `json:"email" comment:"邮箱" binding:"required,email"` - DeptId int `json:"deptId" comment:"部门" binding:"required"` + Email string `json:"email" comment:"邮箱" vd:"required,email"` + DeptId int `json:"deptId" comment:"部门" vd:"required"` PostId int `json:"postId" comment:"岗位"` Remark string `json:"remark" comment:"备注"` - Status string `json:"status" comment:"状态" binding:"required" default:"1"` + Status string `json:"status" comment:"状态" vd:"required" default:"1"` common.ControlBy } @@ -183,6 +183,6 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { // PassWord 密码 type PassWord struct { - NewPassword string `json:"newPassword" binding:"required"` - OldPassword string `json:"oldPassword" binding:"required"` + NewPassword string `json:"newPassword" vd:"required"` + OldPassword string `json:"oldPassword" vd:"required"` } diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index e7a69dd0..2392c237 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -60,7 +60,7 @@ func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *mode } // Insert 创建SysUser对象 -func (e *SysUser) Insert(c *dto.SysUserControl) error { +func (e *SysUser) Insert(c *dto.SysUserInsertReq) error { var err error var data models.SysUser var i int64 @@ -84,7 +84,7 @@ func (e *SysUser) Insert(c *dto.SysUserControl) error { } // Update 修改SysUser对象 -func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error { +func (e *SysUser) Update(c *dto.SysUserUpdateReq, p *actions.DataPermission) error { var err error var model models.SysUser db := e.Orm.Scopes(