From 4402cbe26094d57c2694d9c13c7635bbdb4dc68a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 11:01:00 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 df57089..7e565cf 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
@@ -143,9 +143,10 @@
}
String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
for (String keyword:keywords) {
- KeywordEntity keywordEntity=new KeywordEntity();
+ if (keyword!=null&&!keyword.equals(""))
+ {KeywordEntity keywordEntity=new KeywordEntity();
keywordEntity.setName(keyword);
- keywordEntityList.add(keywordEntity);
+ keywordEntityList.add(keywordEntity);}
}
recommendResult.setKeywordEntityList(keywordEntityList);
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
--
Gitblit v1.7.1