From ae2b1e123549055a0e2fe4514978ab7288b74316 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 27 十月 2022 14:56:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index 5bbfd5a..9c9e4d3 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -136,6 +136,7 @@
for (Search search : searches) {
search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord, search.getClassifyId().toString()));
}
+ queryResults.setOrganizationChartEntityList(organizationChartMapper.selectByKeyWord(keyWord));
queryResults.setSearchList(searches);
List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
for (Search search : searchesAssociate) {
--
Gitblit v1.7.1