mirror of
https://github.com/tiger1103/gfast.git
synced 2026-09-21 02:04:07 +00:00
升级gf与gtoken到最新版本,更新gf生成的model为最新版本
This commit is contained in:
@@ -490,7 +490,7 @@ func (c *Auth) EditUser(r *ghttp.Request) {
|
||||
}
|
||||
response.SusJson(true, r, "修改管理员成功")
|
||||
}
|
||||
id := r.GetRequestInt("id")
|
||||
id := r.GetUint64("id")
|
||||
//用户用户信息
|
||||
userEntity, err := user.Model.Where("id=?", id).One()
|
||||
if err != nil {
|
||||
@@ -511,7 +511,7 @@ func (c *Auth) EditUser(r *ghttp.Request) {
|
||||
response.FailJson(true, r, "获取用户角色数据失败")
|
||||
}
|
||||
if checkedRoleIds == nil {
|
||||
checkedRoleIds = g.SliceInt{}
|
||||
checkedRoleIds = []uint{}
|
||||
}
|
||||
//获取岗位信息
|
||||
posts, err := post_service.GetUsedPost()
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"gfast/library/response"
|
||||
"github.com/gogf/gf/frame/g"
|
||||
"github.com/gogf/gf/net/ghttp"
|
||||
"github.com/gogf/gf/util/gconv"
|
||||
"github.com/gogf/gf/util/gvalid"
|
||||
)
|
||||
|
||||
@@ -158,7 +159,7 @@ func (c *Dict) DataAdd(r *ghttp.Request) {
|
||||
response.FailJson(true, r, err.(*gvalid.Error).FirstString())
|
||||
}
|
||||
userId := user_service.GetLoginID(r) //获取登陆用户id
|
||||
_, err := dict_service.AddSaveData(req, userId)
|
||||
_, err := dict_service.AddSaveData(req, gconv.Uint64(userId))
|
||||
if err != nil {
|
||||
response.FailJson(true, r, err.Error())
|
||||
}
|
||||
@@ -183,7 +184,7 @@ func (c *Dict) DataEdit(r *ghttp.Request) {
|
||||
response.FailJson(true, r, err.(*gvalid.Error).FirstString())
|
||||
}
|
||||
userId := user_service.GetLoginID(r)
|
||||
_, err := dict_service.EditSaveData(req, userId)
|
||||
_, err := dict_service.EditSaveData(req, gconv.Uint64(userId))
|
||||
if err != nil {
|
||||
response.FailJson(true, r, err.Error())
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ func (c *Dept) EditDept(r *ghttp.Request) {
|
||||
response.SusJson(true, r, "编辑成功")
|
||||
|
||||
}
|
||||
id := r.GetInt64("id")
|
||||
id := r.GetUint64("id")
|
||||
if id == 0 {
|
||||
response.FailJson(true, r, "参数错误")
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ func (c *Index) GetInfo(r *ghttp.Request) {
|
||||
roles, err := user_service.GetAdminRole(userId, allRoles)
|
||||
if err == nil {
|
||||
name := make([]string, len(roles))
|
||||
roleIds := make([]int, len(roles))
|
||||
roleIds := make([]uint, len(roles))
|
||||
for k, v := range roles {
|
||||
name[k] = v.Name
|
||||
roleIds[k] = v.Id
|
||||
@@ -79,7 +79,7 @@ func (c *Index) GetRouters(r *ghttp.Request) {
|
||||
|
||||
//获取无需验证权限的用户id
|
||||
for _, v := range service.NotCheckAuthAdminIds {
|
||||
if v == userId {
|
||||
if gconv.Uint64(v) == userId {
|
||||
isSuperAdmin = true
|
||||
break
|
||||
}
|
||||
@@ -91,7 +91,7 @@ func (c *Index) GetRouters(r *ghttp.Request) {
|
||||
roles, err := user_service.GetAdminRole(userId, allRoles)
|
||||
if err == nil {
|
||||
name := make([]string, len(roles))
|
||||
roleIds := make([]int, len(roles))
|
||||
roleIds := make([]uint, len(roles))
|
||||
for k, v := range roles {
|
||||
name[k] = v.Name
|
||||
roleIds[k] = v.Id
|
||||
|
||||
Reference in New Issue
Block a user