fix: 优化栖息地逻辑

This commit is contained in:
tangwei 2026-05-28 14:20:22 +08:00
parent f757060292
commit ec15fabda4

View File

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