From 410c033483659692226f3ae7d00bc2d2f51ad42b Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Thu, 9 Dec 2021 16:16:44 +0800
Subject: [PATCH] fix(workflow): returns resource without suffix keyword

---
 .../Elasticsearch/ElasticsearchPersistenceProvider.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch/LINGYUN/Abp/WorkflowCore/Persistence/Elasticsearch/ElasticsearchPersistenceProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch/LINGYUN/Abp/WorkflowCore/Persistence/Elasticsearch/ElasticsearchPersistenceProvider.cs
index e1800bd1a..5a4a377c8 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch/LINGYUN/Abp/WorkflowCore/Persistence/Elasticsearch/ElasticsearchPersistenceProvider.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch/LINGYUN/Abp/WorkflowCore/Persistence/Elasticsearch/ElasticsearchPersistenceProvider.cs
@@ -163,7 +163,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch
             var response = await client.SearchAsync<Event>(
                 dsl => dsl.Index(CreateIndex(PersistenceIndexConsts.EventIndex))
                     .Query(q => q.Bool(b => b.Filter(terms)))
-                    .Source(s => s.Includes(e => e.Field(f => f.Id.Suffix("keyword")))),
+                    .Source(s => s.Includes(e => e.Field(f => f.Id))),
                 ct: cancellationToken);
 
             CheckResponse(response);
@@ -185,7 +185,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch
             var response = await client.SearchAsync<EventSubscription>(
                 dsl => dsl.Index(CreateIndex(PersistenceIndexConsts.EventSubscriptionIndex))
                     .Query(q => q.Bool(b => b.Filter(terms)))
-                    .Source(s => s.Includes(e => e.Field(f => f.Id.Suffix("keyword"))))
+                    .Source(s => s.Includes(e => e.Field(f => f.Id)))
                     .Sort(s => s.Field(f => f.SubscribeAsOf, SortOrder.Ascending))
                     .Take(1),
                 ct: cancellationToken);
@@ -208,7 +208,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch
             var response = await client.SearchAsync<Event>(
                 dsl => dsl.Index(CreateIndex(PersistenceIndexConsts.EventIndex))
                     .Query(q => q.Bool(b => b.Filter(terms)))
-                    .Source(s => s.Includes(e => e.Field(f => f.Id.Suffix("keyword")))),
+                    .Source(s => s.Includes(e => e.Field(f => f.Id))),
                 ct: cancellationToken);
 
             CheckResponse(response);
@@ -229,7 +229,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch
             var response = await client.SearchAsync<WorkflowInstance>(
                 dsl => dsl.Index(CreateIndex(PersistenceIndexConsts.WorkflowInstanceIndex))
                     .Query(q => q.Bool(b => b.Filter(terms)))
-                    .Source(s => s.Includes(e => e.Field(f => f.Id.Suffix("keyword")))),
+                    .Source(s => s.Includes(e => e.Field(f => f.Id))),
                 ct: cancellationToken);
 
             CheckResponse(response);