wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046

Browse Source
This commit is contained in:
chenwenjian 2024-01-24 14:46:37 +08:00
commit 51aef4d218
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
View File

@ -509,8 +509,6 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
} else {
owRoleInfo.setRoles(roles.stream()
.filter(r -> owRoleIds.contains(r.getId()))
.filter(r -> r.getProductUnitType() == null
|| ow.convertGetJoinType().equals(r.getProductUnitType())) //匹配标签
.collect(Collectors.toSet()));
}
owRoleMap.add(owRoleInfo);