驳回重复通知
This commit is contained in:
parent
ec2b030a30
commit
0753dcf27c
|
@ -149,7 +149,11 @@ public class ActivitiNoticeAspect {
|
||||||
Boolean termination = Boolean.valueOf(kv.get("termination") != null ? kv.get("termination").toString() : Boolean.FALSE.toString()); // 直接终结
|
Boolean termination = Boolean.valueOf(kv.get("termination") != null ? kv.get("termination").toString() : Boolean.FALSE.toString()); // 直接终结
|
||||||
Boolean endByUser = Boolean.valueOf(kv.get("endByUser") != null ? kv.get("endByUser").toString() : Boolean.FALSE.toString()); // 用户终止
|
Boolean endByUser = Boolean.valueOf(kv.get("endByUser") != null ? kv.get("endByUser").toString() : Boolean.FALSE.toString()); // 用户终止
|
||||||
Boolean reject = Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝
|
Boolean reject = Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝
|
||||||
if (Boolean.TRUE.equals(endByUser)) {
|
Boolean backToFirst = Boolean.valueOf(kv.get("backToFirst") != null ? kv.get("backToFirst").toString() : Boolean.FALSE.toString()); // 驳回
|
||||||
|
if (Boolean.TRUE.equals(backToFirst)) {
|
||||||
|
result = " 被驳回";
|
||||||
|
return;
|
||||||
|
} else if (Boolean.TRUE.equals(endByUser)) {
|
||||||
result = " 发起者终止";
|
result = " 发起者终止";
|
||||||
} else if (Boolean.TRUE.equals(termination)) {
|
} else if (Boolean.TRUE.equals(termination)) {
|
||||||
result = " 终止被拒";
|
result = " 终止被拒";
|
||||||
|
@ -225,7 +229,10 @@ public class ActivitiNoticeAspect {
|
||||||
Boolean termination = Boolean.valueOf(kv.get("termination") != null ? kv.get("termination").toString() : Boolean.FALSE.toString()); // 直接终结
|
Boolean termination = Boolean.valueOf(kv.get("termination") != null ? kv.get("termination").toString() : Boolean.FALSE.toString()); // 直接终结
|
||||||
Boolean endByUser = Boolean.valueOf(kv.get("endByUser") != null ? kv.get("endByUser").toString() : Boolean.FALSE.toString()); // 用户终止
|
Boolean endByUser = Boolean.valueOf(kv.get("endByUser") != null ? kv.get("endByUser").toString() : Boolean.FALSE.toString()); // 用户终止
|
||||||
Boolean reject = Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝
|
Boolean reject = Boolean.valueOf(kv.get("reject") != null ? kv.get("reject").toString() : Boolean.FALSE.toString()); // 被拒绝
|
||||||
if (Boolean.TRUE.equals(endByUser)) {
|
Boolean backToFirst = Boolean.valueOf(kv.get("backToFirst") != null ? kv.get("backToFirst").toString() : Boolean.FALSE.toString()); // 驳回
|
||||||
|
if (Boolean.TRUE.equals(backToFirst)) {
|
||||||
|
result = " 被驳回";
|
||||||
|
} else if (Boolean.TRUE.equals(endByUser)) {
|
||||||
result = " 发起者终止";
|
result = " 发起者终止";
|
||||||
} else if (Boolean.TRUE.equals(termination)) {
|
} else if (Boolean.TRUE.equals(termination)) {
|
||||||
result = "终止被拒";
|
result = "终止被拒";
|
||||||
|
|
Loading…
Reference in New Issue