diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java index 8250b4e6..c5dd4f6e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java @@ -138,9 +138,11 @@ public class TodoSyncCardService { request.setSubBizCode(todo.getSubBizCode()); request.setReceivers(Sets.newHashSet(PeerPerson.create( todo.getExecutorPersonId(), todo.getOuId(), todo.getOrgId()))); - request.setBizState(business.getBizCategory() == BizCategoryEnum.FLOW - ? determineCardBizStateForFlowTodo(business) - : determineCardBizStateForBizTodo(todo)); + if (todo.getState() != PendingMessageStateEnum.PROCESSING) { + request.setBizState(business.getBizCategory() == BizCategoryEnum.FLOW + ? determineCardBizStateForFlowTodo(business) + : determineCardBizStateForBizTodo(todo)); + } request.setCardCompleted(todo.getState() == PendingMessageStateEnum.COMPLETED); TodoRequestContext ctx = TodoRequestContext .create("updateCardState", event) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptor.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptor.java similarity index 96% rename from inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptor.java rename to inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptor.java index c38e9ca5..7a36c11a 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptor.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptor.java @@ -15,7 +15,7 @@ import java.util.Optional; * @author yanglin */ @RequiredArgsConstructor -class FlowTodoCardButtonInterceptor implements CardButtonInterceptor { +class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor { private final Todo todo; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptorFactory.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptorFactory.java similarity index 90% rename from inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptorFactory.java rename to inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptorFactory.java index b34b20a7..7e339904 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/FlowTodoCardButtonInterceptorFactory.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/flow/WorkflowTodoCardButtonInterceptorFactory.java @@ -19,7 +19,7 @@ import javax.annotation.Nullable; @Slf4j @Component @RequiredArgsConstructor -class FlowTodoCardButtonInterceptorFactory implements CardButtonInterceptorFactory { +class WorkflowTodoCardButtonInterceptorFactory implements CardButtonInterceptorFactory { private final TodoDao todoDao; @@ -36,7 +36,7 @@ class FlowTodoCardButtonInterceptorFactory implements CardButtonInterceptorFacto log.warn("todo not found. identityCode={}", identityCode); return null; } - return new FlowTodoCardButtonInterceptor(todo); + return new WorkflowTodoCardButtonInterceptor(todo); } } \ No newline at end of file