From 6bdd4b3c30e915fbf8322b5e89f4147399210b15 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 21 Jul 2022 17:28:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=95=B0=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/resource/service/impl/ResourceServiceImpl.java | 4 ++-- .../src/main/resources/mapper/resource/ResourceDao.xml | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) 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 @@