From f85ac96e9fc6ad9f41797c8230542c29db378172 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 25 May 2021 11:53:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(backend):=E5=85=B3=E8=81=94=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E3=80=81=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableUnionService.java    | 1 +
 frontend/src/views/dataset/data/UnionView.vue                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableUnionService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableUnionService.java
index 3c8ec99224..12a8004b7a 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableUnionService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableUnionService.java
@@ -88,6 +88,7 @@ public class DataSetTableUnionService {
         criteria.andTargetTableFieldIdEqualTo(datasetTableUnion.getTargetTableFieldId());
         List<DatasetTableUnion> sourceResult = datasetTableUnionMapper.selectByExample(datasetTableUnionExample);
         datasetTableUnionExample.clear();
+        criteria = datasetTableUnionExample.createCriteria();
         if (StringUtils.isNotEmpty(datasetTableUnion.getId())) {
             criteria.andIdNotEqualTo(datasetTableUnion.getId());
         }
diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index 19edacf70c..e975d11c51 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -230,6 +230,7 @@ export default {
         targetTableFieldId: '',
         targetUnionRelation: ''
       }
+      this.targetTable = {}
     },
 
     edit(item) {