From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/java/com/highdatas/mdm/service/impl/MaintainFieldServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MaintainFieldServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MaintainFieldServiceImpl.java
index f0412ce..27a676b 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MaintainFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MaintainFieldServiceImpl.java
@@ -104,6 +104,15 @@
if (resultMap == null) {
return null;
}
+ if (maintainFieldId.equalsIgnoreCase(Constant.All)) {
+ Collection<List<Maintain>> values = resultMap.values();
+ HashSet<Maintain> maintains = new HashSet<>();
+ for (List<Maintain> value : values) {
+ maintains.addAll(value);
+ }
+
+ return new ArrayList<>(maintains);
+ }
return resultMap.get(maintainFieldId);
}
@@ -362,10 +371,10 @@
public List<Maintain> getMaintainListByMaintainField(String id, String tableName) {
MaintainField maintainField = selectById(id);
if (maintainField == null) {
- if (!id.equalsIgnoreCase(Constant.Default)){
+ if (!id.equalsIgnoreCase(Constant.Default) && !id.equalsIgnoreCase(Constant.All)){
return null;
}else {
- maintainField = new MaintainField().setId(Constant.Default).setTableName(tableName);
+ maintainField = new MaintainField().setId(id).setTableName(tableName);
}
}
--
Gitblit v1.8.0