Commit 17f0c48c authored by tianbo's avatar tianbo

feature(jg):工作台快捷入口菜单过滤掉非快捷菜单

parent d7a133de
...@@ -462,11 +462,25 @@ public class CommonServiceImpl implements ICommonService { ...@@ -462,11 +462,25 @@ public class CommonServiceImpl implements ICommonService {
} else { } else {
permissionModels = FeignUtil.remoteCall(() -> Privilege.permissionClient.treeByRoles(roleSeqs.toString(), menuAgent, permissionType, path, RequestContext.getAppKey())); permissionModels = FeignUtil.remoteCall(() -> Privilege.permissionClient.treeByRoles(roleSeqs.toString(), menuAgent, permissionType, path, RequestContext.getAppKey()));
} }
// 过滤非快捷菜单
permissionModels = filterNonWrapPermission(permissionModels);
result.put("permission", permissionModels); result.put("permission", permissionModels);
result.put("company", company); result.put("company", company);
return result; return result;
} }
private Collection<PermissionModel> filterNonWrapPermission(Collection<PermissionModel> permissionModels) {
if (!ValidationUtil.isEmpty(permissionModels)) {
permissionModels.forEach(permissionModel -> {
if (!ValidationUtil.isEmpty(permissionModel.getChildren())) {
permissionModel.setChildren(filterNonWrapPermission(permissionModel.getChildren()));
}
});
permissionModels = permissionModels.stream().filter(permissionModel -> permissionModel.getIsWarp() || (!permissionModel.getIsWarp() && !ValidationUtil.isEmpty(permissionModel.getChildren()))).collect(Collectors.toList());
}
return ValidationUtil.isEmpty(permissionModels) ? null : permissionModels;
}
@Override @Override
public void useFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response) { public void useFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response) {
Objects.requireNonNull(useFlagParamDto, "参数不能为空"); Objects.requireNonNull(useFlagParamDto, "参数不能为空");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment