From fd07f94f9872a67e7ddeabd2668f8a63dae9d905 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 14:00:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2&=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_env/wte/service/impl/WeFishServiceImpl.java | 3 ++- .../threedRoam/service/impl/MsThreedRoamMServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java index c8faf6af..78834cd4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java @@ -5358,7 +5358,8 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap = new HashMap<>(); sql.append("SELECT COUNT(1) AS cnt FROM SD_MM_B_H mm ") .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = mm.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(mm.IS_DELETED, 0) = 0 ") + .append("WHERE 1=1 ") +// .append("AND NVL(mm.IS_DELETED, 0) = 0 ") .append("AND mm.STTP = 'MM' ") .append("AND NVL(mm.MWAY, 0) = 2 "); appendWeEnvmBaseIdCondition(sql, paramMap, "eng.BASE_ID", baseId); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java index 09604787..fbef37ff 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -48,6 +49,7 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl getKendoListCustReturn(DataSourceRequest dataSourceRequest) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();