From 5bac93baf5659ce013163f884c9dce41990a860e Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期一, 23 三月 2020 08:49:41 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java
index 90ff713..ffbb06f 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/ActivitiServiceImpl.java
@@ -112,17 +112,18 @@
List<Flows> maintainList = records.stream()
.filter(flows -> flows.getBusinessType().equals(ActivitiBusinessType.maintain))
+ .filter(flows -> (!flows.getStatus().equals(ActivitiStatus.open) || !flows.getStatus().equals(ActivitiStatus.close)))
.filter(flows -> maintainService.selectById(flows.getBusinessId()) != null)
.filter(flows -> maintainService.selectById(flows.getBusinessId()).getTableName().equalsIgnoreCase(tableName)).collect(Collectors.toList());
-
- List<Flows> maintainFieldList = records.stream()
+ List<Flows> collect = records.stream()
.filter(flows -> flows.getBusinessType().equals(ActivitiBusinessType.field))
+ .filter(flows -> (!flows.getStatus().equals(ActivitiStatus.open) || !flows.getStatus().equals(ActivitiStatus.close)))
.filter(flows -> maintainFieldService.selectById(flows.getBusinessId()) != null)
.filter(flows -> maintainFieldService.selectById(flows.getBusinessId()).getTableName().equalsIgnoreCase(tableName)).collect(Collectors.toList());
records = new ArrayList<>();
- records.addAll(maintainFieldList);
records.addAll(maintainList);
+ records.addAll(collect);
}
Page page = new Page(records.size());
page.setPageNo(pageNo);
--
Gitblit v1.8.0