From f8aa4b70eff2bf1ff7c24c28958194c728cbda68 Mon Sep 17 00:00:00 2001
From: lvshaohua <764616596@qq.com>
Date: Tue, 16 Apr 2024 13:50:58 +0800
Subject: [PATCH] =?UTF-8?q?terminals=E4=BD=BF=E7=94=A8=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java | 2 +-
 .../axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java  | 2 +-
 .../server/service/impl/SaasFeatureResourceCacheService.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java
index 2c2438d3..c8a33df3 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/GetFeatureResourceTreeReq.java
@@ -20,7 +20,7 @@ public class GetFeatureResourceTreeReq {
     private String keyword;
 
     /** 端 **/
-    private String terminal;
+    private List<String> terminals;
 
     /** 展示状态 默认不传返回全部 0-隐藏 1-显示 **/
     private Integer status;
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java
index 89382aa8..9af58cd8 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureResourceDao.java
@@ -37,7 +37,7 @@ public class SaasFeatureResourceDao extends ServiceImpl<SaasFeatureResourceMappe
                         SaasFeatureResource::getTerminal, SaasFeatureResource::getParentId,
                         SaasFeatureResource::getDisplayOrder)
                 .eq(SaasFeatureResource::getIsDelete, TableIsDeleteEnum.NORMAL.value)
-                .eq(StringUtils.isNotBlank(req.getTerminal()), SaasFeatureResource::getTerminal, req.getTerminal())
+                .in(CollectionUtils.isNotEmpty(req.getTerminals()), SaasFeatureResource::getTerminal, req.getTerminals())
                 .eq(Objects.nonNull(req.getStatus()), SaasFeatureResource::getStatus, req.getStatus())
                 .in(CollectionUtils.isNotEmpty(req.getFeatureTypes()), SaasFeatureResource::getFeatureType, req.getFeatureTypes())
                 .list();
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java
index e57bbb5d..32fe44a5 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java
@@ -23,7 +23,7 @@ public class SaasFeatureResourceCacheService {
 
     private final SaasFeatureResourceDao featureResourceDao;
 
-    @Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.keyword + '_' + #req.terminal+ '_' + #req.featureTypes", unless = "#result.isEmpty()")
+    @Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.keyword + '_' + #req.terminals+ '_' + #req.featureTypes", unless = "#result.isEmpty()")
     public List<SaasFeatureResource> getByResourceTreeParam (GetFeatureResourceTreeReq req) {
         log.info("get feature resource tree has not user cache!");
         return featureResourceDao.getByResourceTreeParam(req);