数据输出调整

@@ -55,18 +55,22 @@ func FilterRoleAll(adminid int64, companyid int64, list []protocol.RoleBase) []p
 		log.Error(e.Error())
 		log.Error(e.Error())
 		return newlist
 		return newlist
 	}
 	}
-	if companyInfo.AdminId == adminid {
-		return list
-	}
 	for _, v := range list {
 	for _, v := range list {
 		if v.IsDefault == models.ROLE_DEFAULR && v.Types == models.ROLETYPES_GROUP {
 		if v.IsDefault == models.ROLE_DEFAULR && v.Types == models.ROLETYPES_GROUP {
 			admingoroupId = v.Id
 			admingoroupId = v.Id
+			break
 		}
 		}
 	}
 	}
 	for k, v := range list {
 	for k, v := range list {
-		if v.Id == admingoroupId || v.ParentId == admingoroupId {
+		if v.Types == models.ROLETYPES_ROLE && v.IsDefault == models.ROLE_DEFAULR {
 			continue
 			continue
 		}
 		}
+		if companyInfo.AdminId != adminid {
+			//非主管理员
+			if v.Id == admingoroupId || v.ParentId == admingoroupId {
+				continue
+			}
+		}
 
 
 		newlist = append(newlist, list[k])
 		newlist = append(newlist, list[k])
 	}
 	}

@@ -140,7 +140,7 @@ func RoleEdit(param protocol.RequestRoleEdit) (*protocol.ResponseRoleInfo, error
 		var oldParent *models.Role
 		var oldParent *models.Role
 		oldParent, err = models.GetRoleById(param.Pid)
 		oldParent, err = models.GetRoleById(param.Pid)
 		if err != nil {
 		if err != nil {
-			log.Error("获取父级数据失败；%s", err)
+			log.Error("获取旧父级数据失败；%s", err)
 			return nil, protocol.NewErrWithMessage("1")
 			return nil, protocol.NewErrWithMessage("1")
 		}
 		}
 		if yes := oldParent.IsDefaultRole(); yes {
 		if yes := oldParent.IsDefaultRole(); yes {