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

Merge branch 'hotfix/20240426' into 'master'

Browse Source 
Hotfix/20240426

See merge request universal/infrastructure/backend/tyr!46
This commit is contained in:
谭杰 2024-04-29 06:01:56 +00:00
commit e0168b0d50
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java
View File

@ -133,7 +133,11 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic
} else {
//更新 - 恢复不能变更的数据
baseResource.setId(resource.getId());
baseResource.setPath(baseResource.getPath() + "," + resource.getId());
if (baseResource.getParentId() < 0) {
baseResource.setPath(resource.getId().toString());
} else {
baseResource.setPath(baseResource.getPath() + "," + resource.getId());
}
baseResource.setUpdateBy(operatorId);
baseResource.setAppItemId(resource.getAppItemId());
featureResourceDao.updateById(baseResource);
@ -154,6 +158,11 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic
/** 修正当前环境的数据 parentId path **/
private void fixData(SaasFeatureResource resource, String parentCode) {
// 原数据的parentId为负数，表示是端下面的第一层数据，此数据的path为当前数据的id，parentId为原数据的parentId
if (resource.getParentId() < 0) {
resource.setParentId(resource.getParentId());
return;
}
if (StrUtil.isBlank(parentCode)) {
resource.setParentId(0L);
resource.setPath("0");
@ -174,7 +183,11 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic
featureResourceDao.save(resource);
//path追加自身ID
resource.setPath(resource.getPath() + "," + resource.getId());
if (resource.getParentId() < 0) {
resource.setPath(resource.getId().toString());
} else {
resource.setPath(resource.getPath() + "," + resource.getId());
}
featureResourceDao.updateById(resource);
}

4
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
View File

@ -358,7 +358,9 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
List<SaasFeatureResource> parallelFeature = featureResourceDao.lambdaQuery()
.eq(BaseEntity::getIsDelete,0)
.eq(SaasFeatureResource::getParentId, resource.getParentId())
.eq(resource.getParentId() > 0, SaasFeatureResource::getParentId, resource.getParentId())
.le(resource.getParentId() <= 0, SaasFeatureResource::getParentId, 0)
.eq(SaasFeatureResource::getTerminal, resource.getTerminal())
.orderByAsc(SaasFeatureResource::getDisplayOrder)
.list();
List<Long> parallelIds = parallelFeature.stream().map(SaasFeatureResource::getId).collect(Collectors.toList());

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

@ -413,6 +413,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
log.info("build permission for role:{}", role.getId());
Set<Long> rolePermissionIds = role.getMatchFeature(userRoleInfoMap.getWorkspaceId(), userRoleInfoMap.ouId)
.stream()
.filter(Objects::nonNull)
.map(PermissionPointTreeNode::getPermissionPointId)
.collect(Collectors.toSet());
//角色标签类型匹配产品标签类型