lbqms.git - Gitblit

			@@ -52,6 +52,7 @@
			import org.flowable.task.api.history.HistoricTaskInstance;
			import org.flowable.task.service.impl.persistence.entity.TaskEntity;
			import org.flowable.variable.api.persistence.entity.VariableInstance;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -71,11 +72,16 @@
			@Service
			public class ActTaskServiceImpl implements IActTaskService {

			private final RuntimeService runtimeService;
			private final TaskService taskService;
			private final HistoryService historyService;
			private final IdentityService identityService;
			private final ManagementService managementService;
			@Autowired(required = false)
			private RuntimeService runtimeService;
			@Autowired(required = false)
			private TaskService taskService;
			@Autowired(required = false)
			private HistoryService historyService;
			@Autowired(required = false)
			private IdentityService identityService;
			@Autowired(required = false)
			private ManagementService managementService;
			private final ActTaskMapper actTaskMapper;
			private final IWfTaskBackNodeService wfTaskBackNodeService;
			private final ActHiTaskinstMapper actHiTaskinstMapper;
			@@ -260,7 +266,8 @@
			String userId = String.valueOf(LoginHelper.getUserId());
			queryWrapper.eq("t.business_status_", BusinessStatusEnum.WAITING.getStatus());
			queryWrapper.eq(TenantHelper.isEnable(), "t.tenant_id_", TenantHelper.getTenantId());
			queryWrapper.and(w1 -> w1.eq("t.assignee_", userId).or(w2 -> w2.isNull("t.assignee_").apply("exists ( select LINK.ID_ from ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = t.ID_ and LINK.TYPE_ = 'candidate' " + "and (LINK.USER_ID_ = {0} or ( LINK.GROUP_ID_ IN " + getInParam(roleIds) + " ) ))", userId)));
			String ids = StreamUtils.join(roleIds, x -> "'" + x + "'");
			queryWrapper.and(w1 -> w1.eq("t.assignee_", userId).or(w2 -> w2.isNull("t.assignee_").apply("exists ( select LINK.ID_ from ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = t.ID_ and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = {0} or ( LINK.GROUP_ID_ IN (" + ids + ") ) ))", userId)));
			if (StringUtils.isNotBlank(taskBo.getName())) {
			queryWrapper.like("t.name_", taskBo.getName());
			}
			@@ -287,19 +294,6 @@
			}
			}
			return TableDataInfo.build(page);
			}

			private String getInParam(List<String> param) {
			StringBuilder sb = new StringBuilder();
			sb.append("(");
			for (int i = 0; i < param.size(); i++) {
			sb.append("'").append(param.get(i)).append("'");
			if (i != param.size() - 1) {
			sb.append(",");
			}
			}
			sb.append(")");
			return sb.toString();
			}

			/**
			@@ -696,7 +690,7 @@
			if (multiInstance == null && taskList.size() > 1) {
			List<Task> tasks = StreamUtils.filter(taskList, e -> !e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey()));
			if (CollUtil.isNotEmpty(tasks)) {
			actHiTaskinstMapper.deleteBatchIds(StreamUtils.toList(tasks, Task::getId));
			actHiTaskinstMapper.deleteByIds(StreamUtils.toList(tasks, Task::getId));
			}
			}