From 8a793b3cae5f3bb91b02226fbf233b82024632d8 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 19 May 2026 14:21:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9B=91=E6=B5=8B=E7=8A=B6=E6=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/env/service/impl/SdWtMonitorServiceImpl.java | 6 +++--- .../java/com/yfd/platform/utils/QgcQueryWrapperUtil.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java index 43acd6f..8e83a91 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java @@ -57,8 +57,8 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { .append("wt.STTP AS sttpCode, ") .append("wt.STCD AS stcd, ") .append("wt.RSTCD AS rstcd, ") - .append("CAST(NULL AS VARCHAR2(200)) AS stCode, ") - .append("CAST(NULL AS VARCHAR2(200)) AS stName, ") + .append("NULL AS stCode, ") + .append("NULL AS stName, ") .append("eng.DVTP AS dvtp, ") .append("hb.ORDER_INDEX AS baseStepSort, ") .append("eng.HBRVCD AS hbrvcd, ") @@ -69,7 +69,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID ") .append("LEFT JOIN (SELECT DISTINCT STCD FROM SD_WTRV_R WHERE IS_DELETED = 0 AND TM >= SYSDATE - 1) rvRecent ON rvRecent.STCD = wt.STCD ") .append("LEFT JOIN (SELECT DISTINCT STCD FROM SD_WTVT_R WHERE IS_DELETED = 0 AND TM >= SYSDATE - 1) vtRecent ON vtRecent.STCD = wt.STCD ") - .append("WHERE wt.IS_DELETED = 0 AND wt.DTIN_TYPE = 0"); + .append("WHERE wt.IS_DELETED = 0 AND wt.DTIN_TYPE = 0 "); Map paramMap = new HashMap<>(); if (mway != null && !mway.isBlank()) { diff --git a/backend/src/main/java/com/yfd/platform/utils/QgcQueryWrapperUtil.java b/backend/src/main/java/com/yfd/platform/utils/QgcQueryWrapperUtil.java index bdbb6ac..9db62f6 100644 --- a/backend/src/main/java/com/yfd/platform/utils/QgcQueryWrapperUtil.java +++ b/backend/src/main/java/com/yfd/platform/utils/QgcQueryWrapperUtil.java @@ -116,8 +116,7 @@ public class QgcQueryWrapperUtil { } if (columnName != null && columnName.equals(fieldName)) { - if (StrUtil.isEmpty((CharSequence) value)) { - StringBuffer var9 = null; + if (value == null || (value instanceof String && StrUtil.isEmpty((String) value))) { return; }