|
@@ -116,7 +116,9 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
|
|
|
List<SysPrivilege> sysPrivileges = this.list(sysPrivilegeQueryWrapper);
|
|
|
sysPrivilegeList.addAll(sysPrivileges);
|
|
|
}
|
|
|
- return (List<PrivilegeDto>) this.getMenuTreeCommon(sysPrivilegeList);
|
|
|
+ List<PrivilegeDto> list = (List<PrivilegeDto>) this.getMenuTreeCommon(sysPrivilegeList);
|
|
|
+ Collections.sort(list);
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -345,9 +347,8 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
|
|
|
sysPrivilegeMap.put(s.getId(), s);
|
|
|
}
|
|
|
}
|
|
|
- List<SysPrivilege> list = new ArrayList<>(sysPrivilegeMap.values());
|
|
|
- Collections.sort(list);
|
|
|
- privilegeDtoList = (List<PrivilegeDto>) this.getMenuTreeCommon(list);
|
|
|
+ privilegeDtoList = (List<PrivilegeDto>) this.getMenuTreeCommon(new ArrayList<>(sysPrivilegeMap.values()));
|
|
|
+ Collections.sort(privilegeDtoList);
|
|
|
}
|
|
|
return privilegeDtoList;
|
|
|
}
|