Merge branch 'dev'

This commit is contained in:
wangliwen 2022-08-05 09:09:22 +08:00
commit e33a7ede3b
1 changed files with 4 additions and 0 deletions

View File

@ -152,6 +152,7 @@ public class ActivitiNoticeAspect {
Boolean backToFirst = Boolean.valueOf(kv.get("backToFirst") != null ? kv.get("backToFirst").toString() : Boolean.FALSE.toString()); // 驳回
if (Boolean.TRUE.equals(backToFirst)) {
result = " 被驳回";
LOGGER.info(result);
return;
} else if (Boolean.TRUE.equals(endByUser)) {
result = " 发起者终止";
@ -232,6 +233,8 @@ public class ActivitiNoticeAspect {
Boolean backToFirst = Boolean.valueOf(kv.get("backToFirst") != null ? kv.get("backToFirst").toString() : Boolean.FALSE.toString()); // 驳回
if (Boolean.TRUE.equals(backToFirst)) {
result = " 被驳回";
LOGGER.info(result);
return;
} else if (Boolean.TRUE.equals(endByUser)) {
result = " 发起者终止";
} else if (Boolean.TRUE.equals(termination)) {
@ -326,6 +329,7 @@ public class ActivitiNoticeAspect {
}
if (StringUtils.isEmpty(creator)) {
work.remove(workKey);
LOGGER.info("无流程创建者");
return;
}
try {