From 2c2994b7a998a9b324d96e4a6e19a42b35db88f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 15:18:44 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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