Просмотр исходного кода

Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

GouGengquan 11 месяцев назад
Родитель
Сommit
8bc646c811

+ 3 - 1
service/src/main/java/com/dayou/workflow/handler/PersonalNodeHandler.java

@@ -91,7 +91,9 @@ public class PersonalNodeHandler extends WorkNodeProcessable {
                             break;
                         case CHECK_FEEDBACK:
                             if (workNodeCommit.getIfFeedback()!=null && !workNodeCommit.getIfFeedback()) {
-                                nextWorkNode = workNodeService.getNextWorkNode(nextWorkNode.getFlowId(), nextWorkNode.getId());
+                                Map<String, List<WorkflowNodeEnum>> xPersonalNecessaryNodes = CallbackEnum.NecessaryNode.getByProduction(MainBusinessEnum.PERSONAL_BUSINESS.name(),
+                                        production);
+                                nextWorkNode = workNodeService.getNextWorkNodeByBusiness(currentInstanceNode.getFlowId(),MainBusinessEnum.PERSONAL_BUSINESS, QUOTATION_FEEDBACK.name(), xPersonalNecessaryNodes);
                             }
                             break;
                         case CHECK_PERSONAL_CLIENT_TYPE: