From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 6cca075..03927e8 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
@@ -70,6 +70,11 @@
}
@Override
+ public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
+ return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
+ }
+
+ @Override
public int insertConfig(TransactionEvent entity) {
return baseMapper.insertConfig(entity);
}
@@ -111,7 +116,7 @@
queryResults.setSearchList(searches);
List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
for (Search search:searchesAssociate) {
- search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord,search.getClassifyId().toString()));
+ search.setTransactionEventList(baseMapper.queryAssociateNamesList(keyWord,search.getClassifyId().toString()));
}
queryResults.setTransactionEventList(searchesAssociate);
queryResults.setKeywordEntityList( keywordMapper.selectByName(keyWord));
--
Gitblit v1.7.1