From 2f1d43f20c18d7719ae035289143d65944afbd0b Mon Sep 17 00:00:00 2001 From: zhansihu Date: Mon, 15 Apr 2024 13:39:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(2227-NavTree):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/tyr/client/model/res/NavTreeResp.java | 3 +++ .../server/service/impl/SaasFeatureResourceServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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())