From ce90fa1def1da83a1a20d547c786beb48d700867 Mon Sep 17 00:00:00 2001
From: wangxuanran <3055088966@qq.com>
Date: Fri, 12 May 2023 15:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89sq?=
 =?UTF-8?q?l=E6=96=B9=E6=B3=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weaver/xiao/commons/config/service/DealWithMapping.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/weaver/xiao/commons/config/service/DealWithMapping.java b/src/main/java/weaver/xiao/commons/config/service/DealWithMapping.java
index a9af287..e9b168e 100644
--- a/src/main/java/weaver/xiao/commons/config/service/DealWithMapping.java
+++ b/src/main/java/weaver/xiao/commons/config/service/DealWithMapping.java
@@ -5,6 +5,7 @@ import com.google.common.base.Strings;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import weaver.conn.RecordSet;
@@ -670,7 +671,7 @@ public class DealWithMapping extends ToolUtil {
 					} else {
 						tempValue = Util.null2String(mainMap.get(fieldName));
 						if ("".equals(tempValue)) {
-							tempValue = Util.null2String(detailMap.get(fieldNameLower));
+							tempValue = Util.null2String(mainMap.get(fieldNameLower));
 						}
 					}
 				}