From ec15fabda42bf746d625deb2960d87113d3b94a1 Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 28 May 2026 14:20:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A0=96=E6=81=AF?= =?UTF-8?q?=E5=9C=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../env/fh/service/impl/FhHabitatServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java index 47c916d..b52d513 100644 --- a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java @@ -366,7 +366,7 @@ public class FhHabitatServiceImpl implements FhHabitatService { " LEFT JOIN SD_HYDROBASE fhBase ON fhBase.BASEID = fh.BASE_ID " + " INNER JOIN ( " + monitorSql + " ) child ON child.FHSTCD = fh.STCD " + " WHERE NVL(fh.IS_DELETED, 0) = 0 " + - " AND NVL(fh.BASE_ID, 'other') <> 'other' " + +// " AND NVL(fh.BASE_ID, 'other') <> 'other' " + " UNION ALL " + " SELECT fh.STCD AS STCD, " + " fh.STNM AS STNM, " + @@ -417,10 +417,10 @@ public class FhHabitatServiceImpl implements FhHabitatService { " AND a.CODE = 'common' " + " ) rstAlong ON rstAlong.RVCD = NVL(fh.HBRVCD, eng.HBRVCD) AND rstAlong.STCD = fh.RSTCD " + " WHERE NVL(fh.IS_DELETED, 0) = 0 " + - " AND NVL(fh.BASE_ID, 'other') <> 'other' " + - " AND NOT EXISTS ( " + - " SELECT 1 FROM ( " + monitorSql + " ) child WHERE child.FHSTCD = fh.STCD " + - " ) " + +// " AND NVL(fh.BASE_ID, 'other') <> 'other' " + +// " AND NOT EXISTS ( " + +// " SELECT 1 FROM ( " + monitorSql + " ) child WHERE child.FHSTCD = fh.STCD " + +// " ) " + ") t WHERE 1 = 1 "; }