|
@@ -77,17 +77,15 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
|
|
}
|
|
}
|
|
|
|
|
|
u := &db.User{
|
|
u := &db.User{
|
|
- Name: f.UserName,
|
|
|
|
- Email: f.Email,
|
|
|
|
- Passwd: f.Password,
|
|
|
|
- IsActive: true,
|
|
|
|
- LoginType: db.LoginPlain,
|
|
|
|
|
|
+ Name: f.UserName,
|
|
|
|
+ Email: f.Email,
|
|
|
|
+ Passwd: f.Password,
|
|
|
|
+ IsActive: true,
|
|
}
|
|
}
|
|
|
|
|
|
if len(f.LoginType) > 0 {
|
|
if len(f.LoginType) > 0 {
|
|
fields := strings.Split(f.LoginType, "-")
|
|
fields := strings.Split(f.LoginType, "-")
|
|
if len(fields) == 2 {
|
|
if len(fields) == 2 {
|
|
- u.LoginType = db.LoginType(com.StrTo(fields[0]).MustInt())
|
|
|
|
u.LoginSource = com.StrTo(fields[1]).MustInt64()
|
|
u.LoginSource = com.StrTo(fields[1]).MustInt64()
|
|
u.LoginName = f.LoginName
|
|
u.LoginName = f.LoginName
|
|
}
|
|
}
|
|
@@ -180,12 +178,10 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
|
|
|
|
|
|
fields := strings.Split(f.LoginType, "-")
|
|
fields := strings.Split(f.LoginType, "-")
|
|
if len(fields) == 2 {
|
|
if len(fields) == 2 {
|
|
- loginType := db.LoginType(com.StrTo(fields[0]).MustInt())
|
|
|
|
loginSource := com.StrTo(fields[1]).MustInt64()
|
|
loginSource := com.StrTo(fields[1]).MustInt64()
|
|
|
|
|
|
if u.LoginSource != loginSource {
|
|
if u.LoginSource != loginSource {
|
|
u.LoginSource = loginSource
|
|
u.LoginSource = loginSource
|
|
- u.LoginType = loginType
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|