From 709ee454eb582770786d4f66f2df5cd3dc6a72e4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 23 八月 2023 20:05:19 +0800
Subject: [PATCH] 关于集成配置需求更改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 534b064..192f270 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -764,7 +764,7 @@
         boolean ignoreSpace = trim || trimAll;
         if (StringUtils.isBlank(value)) {
             //涓虹┖鐨勬椂鍊欙紝涓嶈兘鐢≦ueryOperation.ISNULL锛屽钩鍙颁笉鐭ラ亾鍟ユ椂鍊欎笉澶勭悊杩欑浜�
-            conditionMap.put("t." + attrId, "null");
+			conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
         } else {
             if (keyRuleVO != null) {
                 String queryKey = "";
@@ -800,8 +800,12 @@
                 queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
                 conditionMap.put(queryKey, queryValue);
             } else {
-                //涓虹┖鐨勬椂鍊欎笉浠h〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
-                conditionMap.put("t." + attrId, "'" +value+ "'");
+				if(StringUtils.isNotBlank(value)) {
+					//涓虹┖鐨勬椂鍊欎笉浠h〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
+					conditionMap.put("t." + attrId, "'" + value + "'");
+				}else{
+					conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
+				}
             }
         }
     }

--
Gitblit v1.9.3