diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/NavTreeResp.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/NavTreeResp.java index f73f8fd4..4abafe9e 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/NavTreeResp.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/NavTreeResp.java @@ -36,6 +36,9 @@ public class NavTreeResp implements IBaseTree { private Long parentId; /** 页面路由 **/ private String linkUrl; + /** 图标 **/ + private String icon; + /** 子级 **/ private List children; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index d349f242..3043dfef 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -82,7 +82,8 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic SaasFeatureResource::getParentId, SaasFeatureResource::getFeatureCode, SaasFeatureResource::getFeatureName, - SaasFeatureResource::getFeatureType) + SaasFeatureResource::getFeatureType, + SaasFeatureResource::getIcon) .eq(SaasFeatureResource::getStatus, FeatureResourceStatus.NORMAL.getCode()) .in(SaasFeatureResource::getId, featureIds) .in(SaasFeatureResource::getFeatureType, FeatureResourceType.navTypes())