Commit 0ea76144 authored by haoyanbin's avatar haoyanbin

user

parent f2bf989b
...@@ -70,7 +70,7 @@ func (e *SysUser) Insert(c *dto.SysUserInsertReq) error { ...@@ -70,7 +70,7 @@ func (e *SysUser) Insert(c *dto.SysUserInsertReq) error {
return err return err
} }
if i > 0 { if i > 0 {
err := errors.New("用户名已存在!") err := errors.New("账户已存在!请更换")
e.Log.Errorf("db error: %s", err) e.Log.Errorf("db error: %s", err)
return err return err
} }
......
...@@ -138,7 +138,7 @@ func (e OrgUser) Insert(c *gin.Context) { ...@@ -138,7 +138,7 @@ func (e OrgUser) Insert(c *gin.Context) {
err = sSysUser.Insert(&reqSysUser) err = sSysUser.Insert(&reqSysUser)
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500, err, err.Error()) e.Error(111, err, err.Error())
return return
} }
...@@ -169,6 +169,13 @@ func (e OrgUser) Update(c *gin.Context) { ...@@ -169,6 +169,13 @@ func (e OrgUser) Update(c *gin.Context) {
return return
} }
_, isBing := s.IsBing(strconv.Itoa(req.UserId), req.Username)
if isBing > 0 {
e.Error(111, err, "账户已存在!请更换")
return
}
req.SetUpdateBy(user.GetUserId(c)) req.SetUpdateBy(user.GetUserId(c))
//数据权限检查 //数据权限检查
......
...@@ -113,3 +113,17 @@ func (e *OrgUser) Remove(d *dto.OrgUserDeleteReq, p *actions.DataPermission) err ...@@ -113,3 +113,17 @@ func (e *OrgUser) Remove(d *dto.OrgUserDeleteReq, p *actions.DataPermission) err
} }
return nil return nil
} }
func (e *OrgUser) IsBing(userId string, username string) (error, int64) {
var err error
var data models.SysUser
var i int64
err = e.Orm.Model(&data).Where("username = ?", username).
Scopes(cDto.SetWhereNE("", "user_id", userId)).
Count(&i).Error
if err != nil {
e.Log.Errorf("db error: %s", err)
return err, 1
}
return nil, i
}
...@@ -70,6 +70,17 @@ func SetWhere(tableName string, fieldName string, fieldValue string) func(db *go ...@@ -70,6 +70,17 @@ func SetWhere(tableName string, fieldName string, fieldValue string) func(db *go
return db.Where(tableName+"."+fieldName+" = ?", fieldValue) return db.Where(tableName+"."+fieldName+" = ?", fieldValue)
} }
} }
func SetWhereNE(tableName string, fieldName string, fieldValue string) func(db *gorm.DB) *gorm.DB {
return func(db *gorm.DB) *gorm.DB {
if fieldValue == "0" || fieldValue == "" {
return db
}
if tableName == "" {
return db.Where(fieldName+" != ?", fieldValue)
}
return db.Where(tableName+"."+fieldName+" != ?", fieldValue)
}
}
func SetWhereIn(tableName string, fieldName string, fieldValue string) func(db *gorm.DB) *gorm.DB { func SetWhereIn(tableName string, fieldName string, fieldValue string) func(db *gorm.DB) *gorm.DB {
return func(db *gorm.DB) *gorm.DB { return func(db *gorm.DB) *gorm.DB {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment