Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] fix data-permission namespace problem #5654

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[Fix] fix data-permission namespace problem #5654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e54a2a4
[Fix] fix data-permission namespace problem
VampireAchao Sep 9, 2024
abcfe27
[style] fix code style for ci follow checkstyle
VampireAchao Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/NamespaceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

package org.apache.shenyu.admin.model.dto;

import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Length;

import java.io.Serializable;

/**
Expand All @@ -36,14 +37,14 @@ public class NamespaceDTO implements Serializable {
/**
* namespace name.
*/
@Max(value = 255, message = "The maximum length is 255")
@Length(max = 255, message = "The maximum length is 255")
@NotNull(message = "namespace name not null")
private String name;

/**
* namespace description.
*/
@Max(value = 255, message = "The maximum length is 255")
@Length(max = 255, message = "The maximum length is 255")
@NotNull(message = "namespace description not null")
private String description;

Expand Down
11 changes: 7 additions & 4 deletions ...u-admin/src/main/java/org/apache/shenyu/admin/service/impl/DataPermissionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,13 @@ public CommonPager<DataPermissionPageVO> listSelectorsByPage(final SelectorQuery
if (totalCount > 0) {
Supplier<Stream<SelectorDO>> selectorDOStreamSupplier = () -> selectorMapper.selectByQuery(selectorQuery).stream();
List<String> selectorIds = selectorDOStreamSupplier.get().map(SelectorDO::getId).collect(Collectors.toList());

Set<String> hasDataPermissionSelectorIds = new HashSet<>(dataPermissionMapper.selectDataIds(selectorIds,
userId, AdminDataPermissionTypeEnum.SELECTOR.ordinal()));


Set<String> hasDataPermissionSelectorIds = new HashSet<>();
if (!selectorIds.isEmpty()) {
hasDataPermissionSelectorIds.addAll(dataPermissionMapper.selectDataIds(selectorIds,
userId, AdminDataPermissionTypeEnum.SELECTOR.ordinal()));
}

selectorList = selectorDOStreamSupplier.get().map(selectorDO -> {
boolean isChecked = hasDataPermissionSelectorIds.contains(selectorDO.getId());
return DataPermissionPageVO.buildPageVOBySelector(selectorDO, isChecked);
Expand Down
Loading