From 755b93e161228b2c13d966e32b6a3b7a60613d2e Mon Sep 17 00:00:00 2001
From: canonical <canonical_entropy@163.com>
Date: Thu, 1 Aug 2024 19:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9AtransformIn=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8C=89=E7=85=A7dataType=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/nop/biz/crud/ObjMetaBasedValidator.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nop-biz/src/main/java/io/nop/biz/crud/ObjMetaBasedValidator.java b/nop-biz/src/main/java/io/nop/biz/crud/ObjMetaBasedValidator.java
index b4adb354b..4dccc1e09 100644
--- a/nop-biz/src/main/java/io/nop/biz/crud/ObjMetaBasedValidator.java
+++ b/nop-biz/src/main/java/io/nop/biz/crud/ObjMetaBasedValidator.java
@@ -378,14 +378,11 @@ private boolean isRefPrimary(IBizObject bizObject, String propName) {
 
     private Object convertValue(IObjPropMeta propMeta, Object value, Map<String, Object> data,
                                 Map<String, Object> ret) {
-//        IEvalAction action = propMeta.getTransformIn();
-//        if (action != null) {
-//            IEvalScope scope = XLang.newEvalScope();
-//            scope.setLocalValue(null, BizConstants.VAR_DATA, data);
-//            scope.setLocalValue(null, BizConstants.VAR_TRNAS_DATA, ret);
-//            scope.setLocalValue(null, BizConstants.VAR_VALUE, value);
-//            value = action.invoke(scope);
-//        }
+        // 如果指定了transformIn，则以它的转换结果为准，不再需要根据类型进行转化。transformIn的结果类型也不一定和dataType一致
+        IEvalAction action = propMeta.getTransformIn();
+        if (action != null) {
+            return value;
+        }
 
         StdDataType type = propMeta.getStdDataType();
         if (type == null)