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

feat:(REQ-2545) 新版菜单树增加icon字段

Browse Source
This commit is contained in:
lilong 2024-06-28 14:35:38 +08:00
parent b9f364a999
commit b89f8c51b4
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TreePermissionResp.java
View File

@ -50,6 +50,16 @@ public class TreePermissionResp implements IBaseTree<TreePermissionResp, Long> {
/** 图标 **/
private String icon;
/**
* 选中的图标
*/
private String activeIcon;
/**
* 更多图标
*/
private String moreIcon;
/**
* 上级资源ID
*/

6
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
View File

@ -14,6 +14,7 @@ import cn.axzo.thrones.client.saas.entity.servicepkg.ServicePkgDetailRes;
import cn.axzo.tyr.client.common.enums.FeatureResourceAuthType;
import cn.axzo.tyr.client.common.enums.FeatureResourceType;
import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
import cn.axzo.tyr.client.model.base.FeatureResourceExtraDO;
import cn.axzo.tyr.client.model.base.WorkspaceOUPair;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.product.ProductFeatureRelationVO;
@ -299,6 +300,11 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
TreePermissionResp treePermissionResp = TreePermissionResp.builder().build();
BeanUtils.copyProperties(e, treePermissionResp);
treePermissionResp.setFeatureId(e.getId());
FeatureResourceExtraDO extra = e.getExtra();
if (Objects.nonNull(extra)) {
treePermissionResp.setActiveIcon(extra.getActiveIcon());
treePermissionResp.setMoreIcon(extra.getMoreIcon());
}
return treePermissionResp;
})
.collect(Collectors.toList());