bug fix

@@ -430,22 +430,32 @@ func (c *CompanyController) InitCompany() {
 	var (
 	var (
 		err error
 		err error
 	)
 	)
-	if len(param.CompanyName) == 0 {
-		log.Error("公司名称空")
-		msg = protocol.BadRequestParam("1")
-		return
-	}
-	if len(param.AdminAccount) == 0 {
-		log.Error("人员账号空")
-		msg = protocol.BadRequestParam("1")
-		return
-	}
-	if len(param.AdminName) == 0 {
-		log.Error("人员名称空")
-		msg = protocol.BadRequestParam("1")
-		return
+	param.CompanyName = strings.TrimSpace(param.CompanyName)
+	param.AdminAccount = strings.TrimSpace(param.AdminAccount)
+	param.AdminName = strings.TrimSpace(param.AdminName)
+	if ok := param.IsEnable(); ok {
+		if len(param.CompanyName) == 0 {
+			log.Error("公司名称空")
+			msg = protocol.BadRequestParam("1")
+			return
+		}
+		if len(param.AdminAccount) == 0 {
+			log.Error("人员账号空")
+			msg = protocol.BadRequestParam("1")
+			return
+		}
+		if len(param.AdminName) == 0 {
+			log.Error("人员名称空")
+			msg = protocol.BadRequestParam("1")
+			return
+		}
+		err = servecompany.InitCompanyInfo(param)
+	} else if ok := param.IsForbid(); ok {
+		err = servecompany.ForbidCompany(param.CompanyId)
+	} else {
+		err = protocol.NewErrWithMessage("1")
 	}
 	}
-	err = servecompany.InitCompanyInfo(param)
+
 	msg = protocol.NewReturnResponse(nil, err)
 	msg = protocol.NewReturnResponse(nil, err)
 	return
 	return
 }
 }

@@ -220,7 +220,8 @@ func (c *RbacController) RoleList() {
 		msg = protocol.BadRequestParam("1")
 		msg = protocol.BadRequestParam("1")
 		return
 		return
 	}
 	}
-	rolelist, err := serverbac.GetRoleList(companyid)
+	userid := c.GetUserId()
+	rolelist, err := serverbac.GetRoleList(companyid, userid)
 	msg = protocol.NewReturnResponse(rolelist, err)
 	msg = protocol.NewReturnResponse(rolelist, err)
 	return
 	return
 }
 }

@@ -139,21 +139,19 @@ type CenterCompanyInfo struct {
 	Status       int8   `json:"status"` //公司的状态 【1:启用】【2:禁用】
 	Status       int8   `json:"status"` //公司的状态 【1:启用】【2:禁用】
 }
 }
 
 
-// func (c CenterCompanyInfo) IsEnable() bool {
-// 	if c.Status == 1 {
-// 		return true
-// 	}
-// 	return false
-// }
-
-// func (c CenterCompanyInfo) IsForbid() bool {
-// 	if c.Status == 2 {
-// 		return true
-// 	}
-// 	return false
-// }
-
-// type Request
+func (c CenterCompanyInfo) IsEnable() bool {
+	if c.Status == 1 {
+		return true
+	}
+	return false
+}
+
+func (c CenterCompanyInfo) IsForbid() bool {
+	if c.Status == 2 {
+		return true
+	}
+	return false
+}
 
 
 type ResponseCenterCompany struct {
 type ResponseCenterCompany struct {
 	UCenterCompanyId int64 `json:"comopany_id"` //总
 	UCenterCompanyId int64 `json:"comopany_id"` //总

@@ -645,6 +645,7 @@ func UserForbid(userCompanyids []int64, companyid int64) error {
 	companyInfo, err = models.GetCompanyById(companyid)
 	companyInfo, err = models.GetCompanyById(companyid)
 	if err != nil {
 	if err != nil {
 		log.Error("GetCompanyById(%d) err：%s", companyid, err)
 		log.Error("GetCompanyById(%d) err：%s", companyid, err)
+		return protocol.NewErrWithMessage("1")
 	}
 	}
 	o := orm.NewOrm()
 	o := orm.NewOrm()
 	_, err = o.QueryTable(&models.UserCompany{}).
 	_, err = o.QueryTable(&models.UserCompany{}).
@@ -659,7 +660,7 @@ func UserForbid(userCompanyids []int64, companyid int64) error {
 		ids []int64
 		ids []int64
 	)
 	)
 	for _, v := range updateIds {
 	for _, v := range updateIds {
-		if v.Id == companyInfo.AdminId {
+		if v.UserId == companyInfo.AdminId {
 			return protocol.NewErrWithMessage("10072")
 			return protocol.NewErrWithMessage("10072")
 		}
 		}
 		ids = append(ids, v.Id)
 		ids = append(ids, v.Id)

@@ -10,7 +10,7 @@ import (
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/orm"
 )
 )
 
 
-//获取全部的权限菜单
+//GetMenuAll 获取全部的权限菜单
 func GetMenuAll() ([]protocol.PermissionItem, error) {
 func GetMenuAll() ([]protocol.PermissionItem, error) {
 	const datasql string = `SELECT id,name,icon,parent_id,senior_status,sort,code
 	const datasql string = `SELECT id,name,icon,parent_id,senior_status,sort,code
 				FROM menu WHERE enabled=1 ORDER BY sort `
 				FROM menu WHERE enabled=1 ORDER BY sort `

@@ -179,17 +179,21 @@ func RoleGroupDelete(param protocol.RequestRoleDelete) error {
 	return nil
 	return nil
 }
 }
 
 
-func GetRoleList(companyId int64) ([]protocol.RoleGroup, error) {
+//GetRoleList 获取角色列表
+func GetRoleList(adminid int64, companyId int64) ([]protocol.RoleGroup, error) {
 	var (
 	var (
 		roleGroups []protocol.RoleGroup
 		roleGroups []protocol.RoleGroup
 		err        error
 		err        error
 		groups     []protocol.RoleInfo
 		groups     []protocol.RoleInfo
+		// companyinfo *models.Company
 	)
 	)
+	// models.GetCompanyById(companyId)
 	groups, err = getRoleGroupByCompany(companyId)
 	groups, err = getRoleGroupByCompany(companyId)
 	if err != nil {
 	if err != nil {
 		log.Error("getRoleGroupByCompany err:%s", err)
 		log.Error("getRoleGroupByCompany err:%s", err)
 		return roleGroups, protocol.NewErrWithMessage("1")
 		return roleGroups, protocol.NewErrWithMessage("1")
 	}
 	}
+
 	for k, v := range groups {
 	for k, v := range groups {
 		var roles []protocol.RoleInfo
 		var roles []protocol.RoleInfo
 		roles, err = getRoleInfoByPid(companyId, v.Id)
 		roles, err = getRoleInfoByPid(companyId, v.Id)