bug fix

@@ -525,13 +525,14 @@ func (c *CompanyController) DepartmentUser() {
 }
 }
 
 
 //CurrentCompanyEdit  编辑当前公司
 //CurrentCompanyEdit  编辑当前公司
+//@router /company/current/edit
 func (c *CompanyController) CurrentCompanyEdit() {
 func (c *CompanyController) CurrentCompanyEdit() {
 	var msg *protocol.ResponseMessage
 	var msg *protocol.ResponseMessage
 	defer func() {
 	defer func() {
 		c.ResposeJson(msg)
 		c.ResposeJson(msg)
 	}()
 	}()
 	type Parameter struct {
 	type Parameter struct {
-		Logo string `json:"string"`
+		Logo string `json:"logo"`
 	}
 	}
 	var param Parameter
 	var param Parameter
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {

@@ -171,8 +171,8 @@ func (c *RbacController) RoleGroupDelete() {
 	return
 	return
 }
 }
 
 
-// RoleList
-// @router /role [get]
+// RoleList ...
+// @router /rbac/role/list [post]
 func (c *RbacController) RoleList() {
 func (c *RbacController) RoleList() {
 	var msg *protocol.ResponseMessage
 	var msg *protocol.ResponseMessage
 	defer func() {
 	defer func() {

@@ -40,7 +40,7 @@ type ResponseDepartmentInfo struct {
 	ID        int64               `json:"id"`
 	ID        int64               `json:"id"`
 	CompanyID int64               `json:"company_id"` //公司
 	CompanyID int64               `json:"company_id"` //公司
 	Name      string              `json:"name"`       //部门名字
 	Name      string              `json:"name"`       //部门名字
-	ParantID  int64               `json:"parant_id"`  //父级部门Id
+	ParantID  int64               `json:"parantId"`   //父级部门Id
 	Manages   []DepartmentManager `json:"manages"`    //部门管理员
 	Manages   []DepartmentManager `json:"manages"`    //部门管理员
 	Members   []DepartmentMember  `json:"members"`    //部门成员
 	Members   []DepartmentMember  `json:"members"`    //部门成员
 	Member    int64               `json:"member"`     //成员数
 	Member    int64               `json:"member"`     //成员数

@@ -42,9 +42,10 @@ type RequestRoleList struct {
 }
 }
 
 
 type RoleInfo struct {
 type RoleInfo struct {
-	Id        int64  `json:"id"`
-	Name      string `json:"name"`
-	IsDefault int8   `json:"is_default"`
+	Id        int64  `json:"id" orm:"column(id)"`
+	Name      string `json:"name" orm:"column(name)"`
+	IsDefault int8   `json:"is_default" orm:"column(is_default)"`
+	Pid       int64  `json:"parentId" orm:"column(pid)"`
 }
 }
 
 
 type RoleGroup struct {
 type RoleGroup struct {

@@ -22,6 +22,10 @@ func init() {
 			beego.NSRouter("/delete", &controllers.CompanyController{}, "post:DepartmentDelete"),
 			beego.NSRouter("/delete", &controllers.CompanyController{}, "post:DepartmentDelete"),
 			beego.NSRouter("/user", &controllers.CompanyController{}, "post:DepartmentUser"),
 			beego.NSRouter("/user", &controllers.CompanyController{}, "post:DepartmentUser"),
 		),
 		),
+		beego.NSNamespace("/company",
+			beego.NSRouter("/current/edit", &controllers.CompanyController{}, "post:CurrentCompanyEdit"),
+			beego.NSRouter("/current/info", &controllers.CompanyController{}, "post:CurrentCompanyInfo"),
+		),
 		beego.NSNamespace("position",
 		beego.NSNamespace("position",
 			beego.NSRouter("/list", &controllers.CompanyController{}, "post:PositionList"),
 			beego.NSRouter("/list", &controllers.CompanyController{}, "post:PositionList"),
 			beego.NSRouter("/add", &controllers.CompanyController{}, "post:PositionAdd"),
 			beego.NSRouter("/add", &controllers.CompanyController{}, "post:PositionAdd"),

@@ -187,7 +187,7 @@ func GetRoleList(companyId int64) ([]protocol.RoleGroup, error) {
 
 
 func getRoleInfoByPid(companyid int64, pid int64) ([]protocol.RoleInfo, error) {
 func getRoleInfoByPid(companyid int64, pid int64) ([]protocol.RoleInfo, error) {
 	const (
 	const (
-		dataSql string = `SELECT id,name,is_default FROM role WHERE company_id=? AND pid=? and delete_at=0 `
+		dataSql string = `SELECT id,name,is_default,pid FROM role WHERE company_id=? AND pid=? and delete_at=0 `
 	)
 	)
 	var (
 	var (
 		err   error
 		err   error

@@ -33,7 +33,7 @@ func ArrayIntDiff(arr1 []int, arr2 []int) []int {
 	}
 	}
 	setmap := make(map[int]bool)
 	setmap := make(map[int]bool)
 	for i := range arr2 {
 	for i := range arr2 {
-		setmap[arr1[i]] = true
+		setmap[arr2[i]] = true
 	}
 	}
 	var result []int
 	var result []int
 	for i := range arr1 {
 	for i := range arr1 {