diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index b579142f..b1de7dfe 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -23,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Date; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CopyOnWriteArraySet; @@ -119,11 +116,11 @@ public class ActivitiNoticeAspect { return; } try { - String result = ""; + String result; 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.valueOf(execution.getVariables().get("reject").toString()); // 被拒绝 + Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝 if (termination) { result = "终止被拒"; } else if (reject) {