diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java index ee6173d7..1bd2c665 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java @@ -66,11 +66,11 @@ public class ZqMonitorServiceImpl implements ZqMonitorService { .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD ") .append(" AND hbrv.BASEID = eng.BASE_ID ") - .append(" AND NVL(hbrv.IS_DELETED, 0) = 0 ") - .append(" AND NVL(hbrv.ENABLED, 1) = 1 ") + .append(" AND hbrv.IS_DELETED = 0 ") + .append(" AND hbrv.ENABLED = 1 ") .append("LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD ") .append("LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD ") - .append("WHERE NVL(t.IS_DELETED, 0) = 0 "); + .append("WHERE t.IS_DELETED = 0 "); if (onlyZq) { sql.append("AND t.STTP = 'ZQ' "); } @@ -1844,7 +1844,7 @@ public class ZqMonitorServiceImpl implements ZqMonitorService { } return switch (field) { case "isDeleted" -> "NVL(t.IS_DELETED, 0)"; - case "sttpFullPath" -> null; + case "sttpFullPath" -> "t.STTP"; case "sttpCode" -> "t.STTP"; case "mway" -> "t.MWAY"; case "dtinType" -> "t.DTIN_TYPE";