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 "; }