diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java index a6d91e63c1..374e793bb1 100644 --- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java @@ -131,7 +131,7 @@ public class TemplateCenterManage { } // 模版管理使用次数推荐 List manage = searchTemplateFromManage(); - return baseResponseV2TransRecommend(v2BaseResponse, templateParams.get("template.url")); + return baseResponseV2TransRecommend(v2BaseResponse, manage, templateParams.get("template.url")); } public MarketPreviewBaseResponse searchTemplatePreview() { @@ -165,7 +165,7 @@ public class TemplateCenterManage { } } - private MarketBaseResponse baseResponseV2TransRecommend(MarketTemplateV2BaseResponse v2BaseResponse, String url) { + private MarketBaseResponse baseResponseV2TransRecommend(MarketTemplateV2BaseResponse v2BaseResponse,List templateManages, String url) { Map useTime = coreOptRecentManage.findTemplateRecentUseTime(); List categoryVO = getCategoriesV2().stream().filter(node -> !"全部".equalsIgnoreCase(node.getLabel())).collect(Collectors.toList()); Map categoriesMap = categoryVO.stream() @@ -181,6 +181,22 @@ public class TemplateCenterManage { } // 最近使用排序 Collections.sort(contents); + Long countDataV = contents.stream().filter(item -> "PANEL".equals(item.getTemplateType())).count(); + Long countDashboard = contents.stream().filter(item -> "SCREEN".equals(item.getTemplateType())).count(); + List templateDataV = templateManages.stream().filter(item -> "PANEL".equals(item.getTemplateType())).collect(Collectors.toList()); + List templateDashboard = templateManages.stream().filter(item -> "SCREEN".equals(item.getTemplateType())).collect(Collectors.toList()); + if(countDataV<10){ + Long addItemCount = 10 -countDataV; + Long addIndex = templateDataV.size()