|
|
|
@ -34,6 +34,8 @@ import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
import java.util.stream.IntStream;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 流程实例Controller
|
|
|
|
@ -278,11 +280,17 @@ public class ExecuteController extends BaseController {
|
|
|
|
|
List<User> users = flowUserservice.listByAssociatedAndTypes(taskId);
|
|
|
|
|
if (!Objects.equals(CooperateType.REDUCTION_SIGNATURE.getKey(), operatorType)) {
|
|
|
|
|
List<String> userIds = StreamUtils.toList(users, User::getProcessedBy);
|
|
|
|
|
warmFlowInteractiveTypeVo.setUserIds(userIds);
|
|
|
|
|
List<String> modifiedUserIds = userIds.stream()
|
|
|
|
|
.map(user -> user.replace("role:", ""))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
warmFlowInteractiveTypeVo.setUserIds(modifiedUserIds);
|
|
|
|
|
list = userService.selectNotUserList(warmFlowInteractiveTypeVo);
|
|
|
|
|
} else {
|
|
|
|
|
List<String> userIds = StreamUtils.toList(users, User::getProcessedBy);
|
|
|
|
|
warmFlowInteractiveTypeVo.setUserIds(userIds);
|
|
|
|
|
List<String> modifiedUserIds = userIds.stream()
|
|
|
|
|
.map(user -> user.replace("role:", ""))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
warmFlowInteractiveTypeVo.setUserIds(modifiedUserIds);
|
|
|
|
|
list = userService.selectUserList(warmFlowInteractiveTypeVo);
|
|
|
|
|
list = StreamUtils.filter(list, sysUser -> !Objects.equals(userId, sysUser.getUserId()));
|
|
|
|
|
}
|
|
|
|
|