From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
index 53b684c..4a6ddd4 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
@@ -142,7 +142,7 @@
return;
}
String fields = masterDataService.getTempFields(null, tableName);
- String tempFields = masterDataService.getFields(tableName + Constant.RECORD, Constant.T);
+ String tempFields = masterDataService.getFields(tableName + Constant.RECORD);
String tableTempName = tableName + Constant.RECORD;
// insert 2 std
@@ -563,20 +563,6 @@
}
}
return result;
- }
-
- @Override
- public boolean getCanAct(String tableName) {
- List<Maintain> maintainList = selectList(new EntityWrapper<Maintain>().eq("table_name", tableName));
-
- long count = maintainList.stream()
- .filter(one -> one.getFlowId() != null)
- .filter(one -> flowsService.getStatusByBusinessId(one.getId()).equals(ActivitiStatus.working)).count();
- if (count == 0) {
- return true;
- } else {
- return false;
- }
}
--
Gitblit v1.8.0