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

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

Browse Source
This commit is contained in:
TanJ 2023-09-15 18:04:17 +08:00
commit af1d3ab133
2 changed files with 2 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/repository/dao/SaasRoleGroupDao.java
View File

@ -46,7 +46,7 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
public void delete(List<Long> id) { public void delete(List<Long> id) {
lambdaUpdate() lambdaUpdate()
.in(BaseEntity::getId,id) .in(BaseEntity::getId,id)
.set(BaseEntity::getIsDelete,id) .set(BaseEntity::getIsDelete,1l)
.update(); .update();
} }

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

@ -421,7 +421,7 @@ public class PermissionGroupImpl implements PermissionGroupService {
.collect(Collectors.groupingBy(SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO::getType)); .collect(Collectors.groupingBy(SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO::getType));
List<SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO> includeScopes = Optional.ofNullable(selectedOuMap.get(PermissionScope.INCLUDE.getCode())).orElse(new ArrayList<>()); List<SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO> includeScopes = Optional.ofNullable(selectedOuMap.get(PermissionScope.INCLUDE.getCode())).orElse(new ArrayList<>());
List<SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO> excludeScopes = Optional.ofNullable(selectedOuMap.get(PermissionScope.EXCLUDE.getCode())).orElse(new ArrayList<>()); List<SaveOrUpdatePermissionGroupVO.PermissionGroupScopeVO> excludeScopes = Optional.ofNullable(selectedOuMap.get(PermissionScope.EXCLUDE.getCode())).orElse(new ArrayList<>());
if (includeScopes.size() + excludeScopes.size() != selectedWorkspace.size()) { if (includeScopes.size() + excludeScopes.size() != selectedOu.size()) {
throw new BizException(BaseCode.BAD_REQUEST, "选择类型设置错误"); throw new BizException(BaseCode.BAD_REQUEST, "选择类型设置错误");
} }
if (CollectionUtils.containsAny(includeScopes, excludeScopes)) { if (CollectionUtils.containsAny(includeScopes, excludeScopes)) {