From 47fbf91cf78e4eb9ad416cbfca53c6bd18c9b09a Mon Sep 17 00:00:00 2001
From: jjkk123456 <1540485519@qq.com>
Date: Wed, 31 Jul 2024 19:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E4=B8=BA=E5=88=AB=E5=90=8D=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=BAnull=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=89=8D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=88=AB=E5=90=8D=E6=98=AF=E5=90=A6=E7=9B=B8?=
 =?UTF-8?q?=E7=AD=89=E3=80=82=E5=A6=82=E6=9E=9C=E4=B8=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=88=AB=E5=90=8D=EF=BC=8C=E5=88=99=E4=B8=8D=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=AB=E5=90=8D=E6=A3=80=E6=9F=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otter/canal/client/adapter/es7x/support/ES7xTemplate.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-adapter/es7x/src/main/java/com/alibaba/otter/canal/client/adapter/es7x/support/ES7xTemplate.java b/client-adapter/es7x/src/main/java/com/alibaba/otter/canal/client/adapter/es7x/support/ES7xTemplate.java
index 2be21733d5..927faec270 100644
--- a/client-adapter/es7x/src/main/java/com/alibaba/otter/canal/client/adapter/es7x/support/ES7xTemplate.java
+++ b/client-adapter/es7x/src/main/java/com/alibaba/otter/canal/client/adapter/es7x/support/ES7xTemplate.java
@@ -314,11 +314,11 @@ public Object getESDataFromDmlData(ESMapping mapping,String owner, Map<String, O
         Object resultIdVal = null;
         for (FieldItem fieldItem : schemaItem.getSelectFields().values()) {
             ColumnItem columnItem = fieldItem.getColumnItems().iterator().next();
-            if (columnItem.getOwner() == null || columnItem.getColumnName() == null) {
+            if (columnItem.getColumnName() == null) {
                 continue;
             }
 
-            if (!columnItem.getOwner().equals(owner)) {
+            if (columnItem.getOwner() != null && !columnItem.getOwner().equals(owner)) {
                 continue;
             }