|
|
@@ -1,7 +1,7 @@
|
|
|
package partial
|
|
|
|
|
|
import (
|
|
|
- "encoding/json"
|
|
|
+ //"encoding/json"
|
|
|
"fmt"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
@@ -406,42 +406,44 @@ func System_UpdateUser(c *entitys.CtrlContext) {
|
|
|
session := c.Db.NewSession()
|
|
|
session.Begin()
|
|
|
defer session.Close()
|
|
|
- //1、删除用户角色
|
|
|
- _, err = session.SQL(sysmodel.SqlDeleteUserRoles, userInfo.Id).Execute()
|
|
|
- if err != nil {
|
|
|
- session.Rollback()
|
|
|
- c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- //2、修改角色
|
|
|
- userRoles := make([]interface{}, 0)
|
|
|
- roles := []string{}
|
|
|
- if userInfo.UserRole != "" {
|
|
|
- err = json.Unmarshal([]byte(userInfo.UserRole), &roles)
|
|
|
- if err != nil {
|
|
|
- roles = append(roles, userInfo.UserRole)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- for _, role := range roles {
|
|
|
- userRole := models.SysUserRole{}
|
|
|
- userRole.Id = utils.NewUUID()
|
|
|
- userRole.RoleId = role
|
|
|
- userRole.UserId = userInfo.Id
|
|
|
- userRole.CreateBy = user_id
|
|
|
- userRole.LastUpdateBy = user_id
|
|
|
- userRole.CreateTime = time.Now()
|
|
|
- userRole.LastUpdateDate = time.Now()
|
|
|
- userRole.DelFlag = 0
|
|
|
- userRoles = append(userRoles, userRole)
|
|
|
- }
|
|
|
- _, err = session.Insert(userRoles...)
|
|
|
- if err != nil {
|
|
|
- session.Rollback()
|
|
|
- c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
- return
|
|
|
- }
|
|
|
+ ////1、删除用户角色
|
|
|
+ //_, err = session.SQL(sysmodel.SqlDeleteUserRoles, userInfo.Id).Execute()
|
|
|
+ //if err != nil {
|
|
|
+ // session.Rollback()
|
|
|
+ // c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //
|
|
|
+ //fmt.Println(userInfo.user)
|
|
|
+ //
|
|
|
+ ////2、修改角色
|
|
|
+ //userRoles := make([]interface{}, 0)
|
|
|
+ //roles := []string{}
|
|
|
+ //if userInfo.UserRole != "" {
|
|
|
+ // err = json.Unmarshal([]byte(userInfo.UserRole), &roles)
|
|
|
+ // if err != nil {
|
|
|
+ // roles = append(roles, userInfo.UserRole)
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //
|
|
|
+ //for _, role := range roles {
|
|
|
+ // userRole := models.SysUserRole{}
|
|
|
+ // userRole.Id = utils.NewUUID()
|
|
|
+ // userRole.RoleId = role
|
|
|
+ // userRole.UserId = userInfo.Id
|
|
|
+ // userRole.CreateBy = user_id
|
|
|
+ // userRole.LastUpdateBy = user_id
|
|
|
+ // userRole.CreateTime = time.Now()
|
|
|
+ // userRole.LastUpdateDate = time.Now()
|
|
|
+ // userRole.DelFlag = 0
|
|
|
+ // userRoles = append(userRoles, userRole)
|
|
|
+ //}
|
|
|
+ //_, err = session.Insert(userRoles...)
|
|
|
+ //if err != nil {
|
|
|
+ // session.Rollback()
|
|
|
+ // c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
+ // return
|
|
|
+ //}
|
|
|
|
|
|
var updateUser models.SysUser
|
|
|
|