diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 3fb73082..bc2188c8 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -533,11 +533,11 @@ public class ResourceServiceImpl extends CrudServiceImpl resultMap = new HashMap<>(); List re = resourceDao.selectTypeCount(null); - //2022-07-05,ytl修改 start + /*//2022-07-05,ytl修改 start re.removeIf(r -> { return org.apache.commons.lang3.StringUtils.equals(r.get("type").toString(), "基础设施"); }); - //2022-07-05,ytl修改 end + //2022-07-05,ytl修改 end*/ switch (Constant.ProjectPlace.getByFlag(projectPlace)) { case TSINGTAO_XHA: { // 青岛西海岸 CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index a345f083..56315a0c 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -536,11 +536,9 @@