Merge remote-tracking branch 'origin/dev_business' into dev_business

云

107 分钟以前 8f3bf7050e65fdbe55eaad74fde307c57dab960e

 yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;

import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
@@ -12,7 +13,6 @@
import org.mockito.Mock;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

@@ -41,7 +41,7 @@
        // mock 方法（FlowableUtils）
        Map<String, Object> processVariables = new HashMap<>();
        processVariables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
                MapUtil.of("activity_001", List.of(1L, 2L)));
                MapUtil.of("activity_001", ListUtil.of(1L, 2L)));
        when(processInstance.getProcessVariables()).thenReturn(processVariables);

        // 调用
@@ -56,7 +56,7 @@
        String activityId = "activity_001";
        Map<String, Object> processVariables = new HashMap<>();
        processVariables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
                MapUtil.of("activity_001", List.of(1L, 2L)));
                MapUtil.of("activity_001", ListUtil.of(1L, 2L)));

        // 调用
        Set<Long> userIds = strategy.calculateUsersByActivity(null, activityId, null,