npe
This commit is contained in:
parent
73e824fe7d
commit
b05a371a0a
|
@ -23,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.CopyOnWriteArraySet;
|
import java.util.concurrent.CopyOnWriteArraySet;
|
||||||
|
|
||||||
|
@ -119,11 +116,11 @@ public class ActivitiNoticeAspect {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
String result = "";
|
String result;
|
||||||
Boolean termination =
|
Boolean termination =
|
||||||
Boolean.valueOf(execution.getVariables().get("termination").toString()); // 直接终结
|
Boolean.valueOf(kv.get("termination") != null ? kv.get("termination").toString() : Boolean.FALSE.toString()); // 直接终结
|
||||||
Boolean reject =
|
Boolean reject =
|
||||||
Boolean.valueOf(execution.getVariables().get("reject").toString()); // 被拒绝
|
Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝
|
||||||
if (termination) {
|
if (termination) {
|
||||||
result = "终止被拒";
|
result = "终止被拒";
|
||||||
} else if (reject) {
|
} else if (reject) {
|
||||||
|
|
Loading…
Reference in New Issue