diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index 3b2674fb..8e700969 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -3519,10 +3519,10 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl paramMap = new HashMap<>(); StringBuilder sql = new StringBuilder(); sql.append("SELECT DISTINCT ") - .append("dic.HBRVCD AS wbsCode, ") - .append("dic.HBRVNM AS wbsName, ") + .append("dic.BASEID AS wbsCode, ") + .append("dic.BASENAME AS wbsName, ") .append("dic.BASEID AS objId, ") .append("NVL(dic.BASEID, 'ZZZZZZZZ') AS baseOrder, ") .append("NVL(dic.ORDER_INDEX, 999999) AS orderIndex ") - .append("FROM SD_HBRV_DIC dic ") - .append("INNER JOIN SD_RSVRCSCD_B r ON r.RVCD = dic.HBRVCD AND NVL(r.IS_DELETED, 0) = 0 ") + .append("FROM SD_HYDROBASE dic ") + .append("INNER JOIN SD_RSVRCSCD_B r ON r.BASE_ID = dic.BASEID AND NVL(r.IS_DELETED, 0) = 0 ") .append("WHERE NVL(dic.IS_DELETED, 0) = 0 ") .append("AND NVL(dic.ENABLED, 1) = 1 "); @@ -3712,7 +3712,8 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl "r.ID"; - case "rvcd" -> "r.RVCD"; + case "rvcd" -> "eng.BASE_ID"; + case "baseId" -> "eng.BASE_ID"; case "rvcdName" -> "rv.RVNM"; case "stcd" -> "r.STCD"; case "ennm" -> "r.ENNM";