From 652abf2cb22ddf1c0369e446af723b43699738c7 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 28 May 2026 10:30:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../env/wq/service/impl/EnvWqDataServiceImpl.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java
index 251334d..b7bc6ab 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java
@@ -1908,11 +1908,11 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
     }
 
 
-
     @Override
     public DataSourceResult<WbsbVo> getWbsbList(DataSourceRequest dataSourceRequest) {
         DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
         String wbsType = loadOptions == null ? null : QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "wbsType");
+        String objId = loadOptions == null ? null : QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "objId");
         if (!"PSB_RVCD".equalsIgnoreCase(wbsType) && !"PSB".equalsIgnoreCase(wbsType)) {
             DataSourceResult<WbsbVo> emptyResult = new DataSourceResult<>();
             emptyResult.setData(new ArrayList<>());
@@ -1922,6 +1922,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
         }
 
         StringBuilder sql = new StringBuilder();
+        Map<String, Object> paramMap = new HashMap<>();
         if ("PSB".equalsIgnoreCase(wbsType)) {
             sql.append("SELECT ")
                     .append("t.BASEID AS id, ")
@@ -1974,6 +1975,10 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                     .append("NULL AS displayDepartment ")
                     .append("FROM SD_HYDROBASE t ")
                     .append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
+            if (StrUtil.isNotBlank(objId)) {
+                sql.append("AND t.BASEID = #{map.objId} ");
+                paramMap.put("objId", objId);
+            }
             sql.append("ORDER BY NVL(t.ORDER_INDEX, 999999), t.BASENAME ASC");
         } else {
             sql.append("SELECT ")
@@ -2028,9 +2033,13 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                     .append("NULL AS displayDepartment ")
                     .append("FROM SD_HBRV_DIC t ")
                     .append("WHERE NVL(t.IS_DELETED, 0) = 0 ");
+            if (StrUtil.isNotBlank(objId)) {
+                sql.append("AND t.BASEID = #{map.objId} ");
+                paramMap.put("objId", objId);
+            }
             sql.append("ORDER BY NVL(t.ORDER_INDEX, 999999), t.HBRVNM ASC");
         }
-        List<WbsbVo> list = microservicDynamicSQLMapper.getAllListWithResultType(sql.toString(), new HashMap<>(), WbsbVo.class);
+        List<WbsbVo> list = microservicDynamicSQLMapper.getAllListWithResultType(sql.toString(), paramMap, WbsbVo.class);
         DataSourceResult<WbsbVo> result = new DataSourceResult<>();
         result.setData(list);
         result.setTotal((long) list.size());