From 8c25ca43ee84fbdb8bffa800b925eec71938ae05 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 十一月 2022 15:01:42 +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 | 13 ++++++++++++-
1 files changed, 12 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 ef4f73f..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) {
@@ -190,6 +191,11 @@
return baseMapper.selectclassifyId(classifyId);
}
+ @Override
+ public List<TransactionEvent> selectClassifyList(List<String> ids) {
+ return baseMapper.selectClassifyList(ids);
+ }
+
@Override
public int countNumByMatterName(String matterName) {
@@ -229,7 +235,12 @@
}
@Override
- public List<TransactionEvent> selectList() {
+ public List<TransactionEvent> selectList(String keyWord) {
+ if (keyWord!=null&&keyWord!=""){
+ return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
+ }
+ else {
return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
+ }
}
}
--
Gitblit v1.7.1