abiao лет назад: 5
Родитель
Сommit
77c1a5144d
1 измененных файлов с 2 добавлено и 17 удалено
  1. 2 17
      go/gopath/src/fohow-statement-api/controllers/user.go

+ 2 - 17
go/gopath/src/fohow-statement-api/controllers/user.go

@@ -24,23 +24,7 @@ func (self *UserController) Get() {
 	if user.Id != uid {
 		self.Ctx.Output.SetStatus(403)
 	}
-	self.Data["json"] = user
-	self.ServeJSON()
-}
-
-// @Title Get
-// @Description get userPermission by user
-// @Param	Authorization	header 	string	true	"格式: Token XXXXXX"
-// @Success 200 {object} models.GetPermissonList
-// @Failure 404 : user not found
-// @Failure 403 :for owner only
-// @router /permissions [get]
-func (self *UserController) GetPermissonList() {
 
-	user := self.Ctx.Input.GetData("user").(models.User)
-	if user.Id == 0 {
-		self.Ctx.Output.SetStatus(404)
-	}
 	menuType := "menu"
 	firstPage := ""
 	//获取用户菜单权限
@@ -68,12 +52,13 @@ func (self *UserController) GetPermissonList() {
 	}
 
 	type Ret struct {
+		User           models.User              `json:"first_page"`
 		FirstPage      string                   `json:"first_page"`
 		PermissionList []*models.WaIdPermission `json:"permission_list"`
 	}
 	ret := new(Ret)
 	ret.PermissionList = permissonMenuList
 	ret.FirstPage = firstPage
-	self.Data["json"] = ret
+	ret.User = user
 	self.ServeJSON()
 }