|
|
|
@ -106,7 +106,6 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
import com.fasterxml.jackson.core.type.TypeReference; |
|
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode; |
|
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode; |
|
|
|
|
import com.google.common.collect.Lists; |
|
|
|
@ -1062,11 +1061,19 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); |
|
|
|
|
if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { |
|
|
|
|
if (processDefinition == null) { |
|
|
|
|
logger.info("process define not exists"); |
|
|
|
|
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
HashMap<Long, Project> userProjects = new HashMap<>(Constants.DEFAULT_HASH_MAP_SIZE); |
|
|
|
|
projectMapper.queryProjectCreatedAndAuthorizedByUserId(loginUser.getId()) |
|
|
|
|
.forEach(userProject -> userProjects.put(userProject.getCode(), userProject)); |
|
|
|
|
if (!userProjects.containsKey(projectCode)) { |
|
|
|
|
logger.info("process define not exists, project dismatch"); |
|
|
|
|
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
DagData dagData = processService.genDagData(processDefinition); |
|
|
|
|
result.put(Constants.DATA_LIST, dagData.getTaskDefinitionList()); |
|
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
|
@ -1318,6 +1325,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
|
|
|
|
|
/** |
|
|
|
|
* batch move process definition |
|
|
|
|
* Will be deleted |
|
|
|
|
* |
|
|
|
|
* @param loginUser loginUser |
|
|
|
|
* @param projectCode projectCode |
|
|
|
|
* @param codes processDefinitionCodes |
|
|
|
|