调整server注入问题

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.BpmActivityB
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskAssignRuleService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import org.flowable.common.engine.api.delegate.event.FlowableEventListener;
 import org.flowable.spring.SpringProcessEngineConfiguration;
@@ -68,9 +69,10 @@ public class BpmFlowableConfiguration {
     // =========== 审批人相关的 Bean ==========
 
     @Bean
-    public BpmActivityBehaviorFactory bpmActivityBehaviorFactory(BpmTaskCandidateInvoker bpmTaskCandidateInvoker) {
+    public BpmActivityBehaviorFactory bpmActivityBehaviorFactory(BpmTaskAssignRuleService taskRuleService) {
         BpmActivityBehaviorFactory bpmActivityBehaviorFactory = new BpmActivityBehaviorFactory();
-        bpmActivityBehaviorFactory.setTaskCandidateInvoker(bpmTaskCandidateInvoker);
+        bpmActivityBehaviorFactory.setBpmTaskRuleService(taskRuleService);
+//        bpmActivityBehaviorFactory.setTaskCandidateInvoker(bpmTaskCandidateInvoker);
         return bpmActivityBehaviorFactory;
     }
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior;
 
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskAssignRuleService;
 import lombok.Setter;
 import org.flowable.bpmn.model.Activity;
 import org.flowable.bpmn.model.UserTask;
@@ -21,24 +22,27 @@ public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory {
 
     private BpmTaskCandidateInvoker taskCandidateInvoker;
 
+    @Setter
+    private BpmTaskAssignRuleService bpmTaskRuleService;
+
     @Override
-    public UserTaskActivityBehavior createUserTaskActivityBehavior(UserTask userTask) {
+    public BpmUserTaskActivityBehavior createUserTaskActivityBehavior(UserTask userTask) {
         return new BpmUserTaskActivityBehavior(userTask)
-                .setTaskCandidateInvoker(taskCandidateInvoker);
+                .setBpmTaskRuleService(bpmTaskRuleService);
     }
 
     @Override
     public ParallelMultiInstanceBehavior createParallelMultiInstanceBehavior(Activity activity,
                                                                              AbstractBpmnActivityBehavior behavior) {
         return new BpmParallelMultiInstanceBehavior(activity, behavior)
-                .setTaskCandidateInvoker(taskCandidateInvoker);
+                .setBpmTaskRuleService(bpmTaskRuleService);
     }
 
     @Override
     public SequentialMultiInstanceBehavior createSequentialMultiInstanceBehavior(Activity activity,
                                                                                  AbstractBpmnActivityBehavior behavior) {
         return new BpmSequentialMultiInstanceBehavior(activity, behavior)
-                .setTaskCandidateInvoker(taskCandidateInvoker);
+                .setBpmTaskRuleService(bpmTaskRuleService);
     }
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java

@@ -23,6 +23,7 @@ import java.util.Set;
 public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceBehavior {
 
     private BpmTaskCandidateInvoker taskCandidateInvoker;
+
     @Setter
     private BpmTaskAssignRuleService bpmTaskRuleService;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java

@@ -17,6 +17,7 @@ import org.flowable.task.service.TaskService;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
 import org.springframework.context.annotation.Lazy;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
 
@@ -28,12 +29,11 @@ import java.util.Set;
  * @author 芋道源码
  */
 @Slf4j
+@Setter
 public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior {
 
+
     @Setter
-    private BpmTaskCandidateInvoker taskCandidateInvoker;
-    @Setter
-    @Lazy // 解决循环依赖
     private BpmTaskAssignRuleService bpmTaskRuleService;
 
     public BpmUserTaskActivityBehavior(UserTask userTask) {