From 03dfa1de5279c75a4206f59226d871823bdbe72e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:59:41 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into local_20221024

---
 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