数据输出格式修改

@@ -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:"parentId"`   //父级部门Id
+	ParantID  int64               `json:"parent_id"`  //父级部门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"`     //成员数

@@ -181,29 +181,31 @@ func RoleGroupDelete(param protocol.RequestRoleDelete) error {
 	return nil
 	return nil
 }
 }
 
 
-func GetRoleList(companyId int64) ([]protocol.RoleInfo, error) {
+func GetRoleList(companyId int64) ([]protocol.RoleGroup, error) {
 	var (
 	var (
-		roleGroups  []protocol.RoleInfo
-		err         error
-		rolesReturn []protocol.RoleInfo
+		roleGroups []protocol.RoleGroup
+		err        error
+		groups     []protocol.RoleInfo
 	)
 	)
-	roleGroups, 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 rolesReturn, protocol.NewErrWithMessage("1")
+		return roleGroups, protocol.NewErrWithMessage("1")
 	}
 	}
-	for _, v := range roleGroups {
+	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)
 		if err != nil {
 		if err != nil {
 			log.Error("getRoleInfoByPid err:%s", err)
 			log.Error("getRoleInfoByPid err:%s", err)
-			continue
+			return roleGroups, protocol.NewErrWithMessage("1")
 		}
 		}
-
-		rolesReturn = append(rolesReturn, roles...)
+		rolegroup := protocol.RoleGroup{
+			RoleInfo: groups[k],
+			Roles:    roles,
+		}
+		roleGroups = append(roleGroups, rolegroup)
 	}
 	}
-	rolesReturn = append(rolesReturn, roleGroups...)
-	return rolesReturn, nil
+	return roleGroups, nil
 }
 }
 
 
 func getRoleInfoByPid(companyid int64, pid int64) ([]protocol.RoleInfo, error) {
 func getRoleInfoByPid(companyid int64, pid int64) ([]protocol.RoleInfo, error) {