|
|
|
@ -33,7 +33,7 @@ func findPermChilds(parent *modeluis.TreePermssion, upms map[string]bool) { |
|
|
|
return |
|
|
|
} |
|
|
|
childs := make([]*modeluis.TreePermssion, 0) |
|
|
|
err := comm.DbSys.Where("parent=?", parent.Uuid).OrderBy("sort ASC,id ASC").Find(&childs) |
|
|
|
err := comm.DbSys.Where("parent=?", parent.Xid).OrderBy("sort ASC,id ASC").Find(&childs) |
|
|
|
if err != nil { |
|
|
|
println("findPermChilds err:" + err.Error()) |
|
|
|
return |
|
|
|
@ -47,7 +47,7 @@ func findPermChilds(parent *modeluis.TreePermssion, upms map[string]bool) { |
|
|
|
t := *parent |
|
|
|
ts := []*modeluis.TreePermssion{&t} |
|
|
|
childs = append(ts, childs...) |
|
|
|
parent.Uuid = "" |
|
|
|
parent.Xid = "" |
|
|
|
} |
|
|
|
parent.Childs = childs |
|
|
|
} |
|
|
|
@ -59,10 +59,10 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { |
|
|
|
userRole := FindUserRole(uid) |
|
|
|
//comm.DbSys.SqlTemplateClient("role.stpl")
|
|
|
|
//rids:=strings.Split(userRole.RoleCodes,",")
|
|
|
|
ses := comm.DbSys.Where("uuid='common'") |
|
|
|
ses := comm.DbSys.Where("xid='common'") |
|
|
|
if len(userRole.RoleCodes) > 0 { |
|
|
|
rcds := strings.Split(userRole.RoleCodes, ",") |
|
|
|
ses.Or(builder.In("uuid", rcds)) |
|
|
|
ses.Or(builder.In("xid", rcds)) |
|
|
|
} |
|
|
|
roles := make([]*models.SysRole, 0) |
|
|
|
err := ses.Find(&roles) |
|
|
|
@ -75,7 +75,7 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { |
|
|
|
continue |
|
|
|
} |
|
|
|
permssions := make([]*modeluis.SysPermssion, 0) |
|
|
|
ses := comm.DbSys.Where(builder.In("uuid", strings.Split(role.Perms, ","))) |
|
|
|
ses := comm.DbSys.Where(builder.In("xid", strings.Split(role.Perms, ","))) |
|
|
|
err := ses.Find(&permssions) |
|
|
|
if err != nil { |
|
|
|
println("FindUserPermission err:" + err.Error()) |
|
|
|
@ -92,7 +92,7 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { |
|
|
|
|
|
|
|
for _, perm := range permssions { |
|
|
|
if len(perm.Value) > 0 { |
|
|
|
if limids[perm.Uuid] == true { |
|
|
|
if limids[perm.Xid] == true { |
|
|
|
perm.Had = true |
|
|
|
} |
|
|
|
perms[perm.Value] = perm |
|
|
|
@ -128,12 +128,12 @@ func FindUserRoles(uid string) []*modeluis.SysURole { |
|
|
|
} |
|
|
|
} |
|
|
|
roles := make([]*modeluis.SysURole, 0) |
|
|
|
err := comm.DbSys.Where("uuid!='common'").Find(&roles) |
|
|
|
err := comm.DbSys.Where("xid!='common'").Find(&roles) |
|
|
|
if err != nil { |
|
|
|
println("FindUserRoles:" + err.Error()) |
|
|
|
} |
|
|
|
for _, v := range roles { |
|
|
|
v.Had = rcds[v.Uuid] == true |
|
|
|
v.Had = rcds[v.Xid] == true |
|
|
|
v.Permls = sysService.FindPermissions(v.Perms) |
|
|
|
} |
|
|
|
return roles |
|
|
|
@ -143,10 +143,10 @@ func FindUserPermission(uid string) map[string]bool { |
|
|
|
userRole := FindUserRole(uid) |
|
|
|
//comm.DbSys.SqlTemplateClient("role.stpl")
|
|
|
|
//rids:=strings.Split(userRole.RoleCodes,",")
|
|
|
|
ses := comm.DbSys.Where("uuid='common'") |
|
|
|
ses := comm.DbSys.Where("xid='common'") |
|
|
|
if len(userRole.RoleCodes) > 0 { |
|
|
|
rcds := strings.Split(userRole.RoleCodes, ",") |
|
|
|
ses.Or(builder.In("uuid", rcds)) |
|
|
|
ses.Or(builder.In("xid", rcds)) |
|
|
|
} |
|
|
|
roles := make([]*models.SysRole, 0) |
|
|
|
err := ses.Find(&roles) |
|
|
|
@ -159,10 +159,10 @@ func FindUserPermission(uid string) map[string]bool { |
|
|
|
continue |
|
|
|
} |
|
|
|
permssions := make([]*models.SysPermssion, 0) |
|
|
|
ses := comm.DbSys.Where(builder.In("uuid", strings.Split(role.Perms, ","))) |
|
|
|
ses := comm.DbSys.Where(builder.In("xid", strings.Split(role.Perms, ","))) |
|
|
|
if len(userRole.Limits) > 0 { |
|
|
|
rcds := strings.Split(userRole.Limits, ",") |
|
|
|
ses.And(builder.NotIn("uuid", rcds)) |
|
|
|
ses.And(builder.NotIn("xid", rcds)) |
|
|
|
} |
|
|
|
err := ses.Find(&permssions) |
|
|
|
if err != nil { |
|
|
|
@ -221,5 +221,5 @@ func CheckUPermission(perm string, c *macaron.Context, ch cache.Cache) (rb bool) |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
return CheckPermission(lguser.Uuid, perm, ch) |
|
|
|
return CheckPermission(lguser.Xid, perm, ch) |
|
|
|
} |
