From 7983b510372bc136d21030a37261d119957fffd3 Mon Sep 17 00:00:00 2001
From: gzp <gengzhipeng@inspur.com>
Date: Mon, 29 Jun 2026 16:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6lableid=E5=85=9C?=
 =?UTF-8?q?=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspur/edp/bef/engine/entity/EntityResourceInfo.java | 3 ++-
 .../bef/engine/repository/adaptor/BefBaseAdaptor.java    | 9 +++++----
 pom.xml                                                  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/business-entity-engine-api/src/main/java/com/inspur/edp/bef/engine/entity/EntityResourceInfo.java b/business-entity-engine-api/src/main/java/com/inspur/edp/bef/engine/entity/EntityResourceInfo.java
index 987d6c7..c173b0f 100644
--- a/business-entity-engine-api/src/main/java/com/inspur/edp/bef/engine/entity/EntityResourceInfo.java
+++ b/business-entity-engine-api/src/main/java/com/inspur/edp/bef/engine/entity/EntityResourceInfo.java
@@ -23,6 +23,7 @@ import com.inspur.edp.bef.bizentity.LogicDeleteControlInfo;
 import com.inspur.edp.bef.engine.entity.exception.BefEngineExceptionBase;
 import com.inspur.edp.bef.engine.entity.exception.ErrorCodes;
 import com.inspur.edp.bef.engine.entity.propertyinfobuilder.BefPropInfoGenerator;
+import com.inspur.edp.bef.bizentity.util.DboColumnMatcher;
 import com.inspur.edp.bef.engine.util.DataTypeConvertor;
 import com.inspur.edp.bef.spi.entity.CodeRuleInfo;
 import com.inspur.edp.bef.spi.entity.builtinimpls.BefEntityResInfoImpl;
@@ -162,7 +163,7 @@ public class EntityResourceInfo extends BefEntityResInfoImpl {
             }
             DataTypePropertyInfo dataTypePropertyInfo = new BefPropInfoGenerator().getDataTypePropertyInfo(field);
             //是为了长度校验时，识别出smallInt类型字段进行值范围比较，给dataTypePropertyInfo增加数据类型字段
-            DatabaseObjectColumn column = dbo.getColumnById(((IGspCommonElement) field).getColumnID());
+            DatabaseObjectColumn column = DboColumnMatcher.findColumnCompat(dbo, (IGspCommonElement) field);
             if (column != null) {
                 GspDbDataType gspDbDataType = DataTypeConvertor.transDataType(column.getDataType());
                 dataTypePropertyInfo.setDbDataType(gspDbDataType);
diff --git a/business-entity-engine-repository/src/main/java/com/inspur/edp/bef/engine/repository/adaptor/BefBaseAdaptor.java b/business-entity-engine-repository/src/main/java/com/inspur/edp/bef/engine/repository/adaptor/BefBaseAdaptor.java
index 80c1220..94bd2b5 100644
--- a/business-entity-engine-repository/src/main/java/com/inspur/edp/bef/engine/repository/adaptor/BefBaseAdaptor.java
+++ b/business-entity-engine-repository/src/main/java/com/inspur/edp/bef/engine/repository/adaptor/BefBaseAdaptor.java
@@ -22,6 +22,7 @@ import com.inspur.edp.bef.bizentity.GspBizEntityObject;
 import com.inspur.edp.bef.bizentity.GspBusinessEntity;
 import com.inspur.edp.bef.bizentity.gspbusinessobject.ParallelTable;
 import com.inspur.edp.bef.bizentity.gspbusinessobject.SQLInfo;
+import com.inspur.edp.bef.bizentity.util.DboColumnMatcher;
 import com.inspur.edp.bef.engine.api.FetchDataContext;
 import com.inspur.edp.bef.engine.api.ISQLFetchData;
 import com.inspur.edp.bef.engine.core.be.EngineBEManager;
@@ -303,7 +304,7 @@ public class BefBaseAdaptor extends EntityRelationalAdaptor {
             tempDbo = dbo;
         }
         if (!isMultiColumn) {
-            var column = tempDbo.getColumnById(element.getColumnID());
+            var column = DboColumnMatcher.findColumnCompat(tempDbo, element);
             if (column == null) {
                 throwDboColumnNotFoundException(element, element.getBelongObject());
             }
@@ -322,7 +323,7 @@ public class BefBaseAdaptor extends EntityRelationalAdaptor {
                 continue;
             }
             IGspCommonElement childEle = (IGspCommonElement) childElement;
-            var column = tempDbo.getColumnById(childEle.getColumnID());
+            var column = DboColumnMatcher.findColumnCompat(tempDbo, childEle);
             if (column == null) {
                 throwDboColumnNotFoundException(childEle, element.getBelongObject());
             }
@@ -359,11 +360,11 @@ public class BefBaseAdaptor extends EntityRelationalAdaptor {
         DatabaseObjectColumn column = null;
         if (!org.apache.commons.lang3.StringUtils.isEmpty(gspBizEntityElement.getRefParallelTableId())) {
             DatabaseObjectTableCore parallelTableDbo = getParallelTableRefDbo(gspBizEntityElement.getRefParallelTableId());
-            column = parallelTableDbo.getColumnById(element.getColumnID());
+            column = DboColumnMatcher.findColumnCompat(parallelTableDbo, element);
             String tableCode = this.getParallelTable(gspBizEntityElement.getRefParallelTableId()).getCode();
             initColumn(element, element, column, tableCode);
         } else {
-            column = dbo.getColumnById(element.getColumnID());
+            column = DboColumnMatcher.findColumnCompat(dbo, element);
             initColumn(element, element, column);
         }
     }
diff --git a/pom.xml b/pom.xml
index f6a0785..44cd916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <properties>
         <bef.framwork.version>0.3.10-SNAPSHOT</bef.framwork.version>
         <cm.engine.version>0.3.3</cm.engine.version>
-        <bef.model.version>0.2.2-rc.1</bef.model.version>
+        <bef.model.version>0.2.2-SNAPSHOT</bef.model.version>
         <lcm.metadata.version>0.1.40</lcm.metadata.version>
     </properties>
 
-- 
Gitee