From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java b/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
index f44e798..87b6d3b 100644
--- a/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/act/impl/TaskServiceImpl.java
@@ -65,13 +65,10 @@
}
- public boolean completeTask(String taskId, boolean pass, String reason, Map<String,Object> other) {
+ public boolean completeTask(String taskId, Object pass, String reason, Map<String,Object> other) {
Map<String, Object> variables = new LinkedHashMap<String, Object>();
if(other != null){
- Set<String> keySet = other.keySet();
- for (String key : keySet) {
- variables.put(key, other.get(key));
- }
+ variables.putAll(other);
}
variables.put("pass", pass);
variables.put("reason", reason);
@@ -88,10 +85,10 @@
}
}
- public boolean completeTask(String taskId, boolean pass, String reason) {
+ public boolean completeTask(String taskId, Object pass, String reason) {
return completeTask(taskId,pass,reason,null);
- }
-
+ }
+
public List<String> getTodoTask() {
TUser onlineUser = getOnlineUser();
Set<String> result = new HashSet<>();
--
Gitblit v1.8.0