|
@@ -2,6 +2,7 @@ package auth_service
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"gfast/app/model/auth_rule"
|
|
"gfast/app/model/auth_rule"
|
|
|
|
|
+ "gfast/app/model/role"
|
|
|
"github.com/gogf/gf/frame/g"
|
|
"github.com/gogf/gf/frame/g"
|
|
|
"github.com/gogf/gf/os/gtime"
|
|
"github.com/gogf/gf/os/gtime"
|
|
|
"github.com/gogf/gf/util/gconv"
|
|
"github.com/gogf/gf/util/gconv"
|
|
@@ -63,3 +64,23 @@ func EditMenu(req *MenuReq, id int) (err error, rows int64) {
|
|
|
rows, _ = res.RowsAffected()
|
|
rows, _ = res.RowsAffected()
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+//获取用户组列表
|
|
|
|
|
+func GetRoleList(where string, params ...interface{}) (err error, list g.List) {
|
|
|
|
|
+ var rl []*role.Entity
|
|
|
|
|
+ if where != "" {
|
|
|
|
|
+ rl, err = role.Model.Where(where, params).OrderBy("list_order asc,id asc").All()
|
|
|
|
|
+ } else {
|
|
|
|
|
+ rl, err = role.Model.OrderBy("list_order asc,id asc").All()
|
|
|
|
|
+ }
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ g.Log().Error(err)
|
|
|
|
|
+ return err, nil
|
|
|
|
|
+ }
|
|
|
|
|
+ list = make(g.List, len(rl))
|
|
|
|
|
+ for k, v := range rl {
|
|
|
|
|
+ tMap := gconv.Map(v)
|
|
|
|
|
+ list[k] = tMap
|
|
|
|
|
+ }
|
|
|
|
|
+ return
|
|
|
|
|
+}
|