diff --git a/cips.frontend/package.json b/cips.frontend/package.json index e17dfe99..7843ab86 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -1,6 +1,6 @@ { "name": "cips.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index d088be21..4b85e70a 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 043e0108..ce958564 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,9 +37,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.2.31 +platform_version=8.2.32 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.121 +platform_core_frontend_version=8.2.122 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 7269f4e2..7456fcac 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 425dd069..e3b76dac 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.rule.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 178b593a..76449460 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.st.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index 31aebe77..f045fbca 100644 --- a/io.sc.platform.ai.frontend/package.json +++ b/io.sc.platform.ai.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.ai.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index d9bc9143..98643c32 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.121", + "version": "8.2.122", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts index 4b452e15..6cd07314 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts +++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts @@ -11,7 +11,7 @@ export class Init { */ public static createProps() { return { - refreshAfterActive: { type: Boolean, default: false },// 当组件被激活时刷新一次 + refreshAfterActive: { type: Boolean, default: false }, // 当组件被激活时刷新一次 height: { type: Number, default: 0 }, // 表格高度 title: { type: String, default: '' }, // 表格标题 autoFetchData: { type: Boolean, default: true }, // 自动加载数据 diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue index ee9025d5..2ae388f4 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue @@ -88,7 +88,7 @@ const changeFirstColMaxWidth = () => { const refresh = () => { loadingRef.value = true; axios - .get(Environment.apiContextPath('/api/flowable/process/query/myDoneTask?page=1&size=10&pageable=true')) + .get(Environment.apiContextPath('/api/flowable/process/query/myDoneTask?page=1&size=10&pageable=true&sortBy=-startTime')) .then((response: any) => { itemsRef.value = response.data.content || []; loadingRef.value = false; diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue index 0529e531..f70a5918 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue @@ -88,7 +88,7 @@ const changeFirstColMaxWidth = () => { const refresh = () => { loadingRef.value = true; axios - .get(Environment.apiContextPath('/api/flowable/process/query/myFinishedTask?page=1&size=10&pageable=true')) + .get(Environment.apiContextPath('/api/flowable/process/query/myFinishedTask?page=1&size=10&pageable=true&sortBy=-startTime')) .then((response: any) => { itemsRef.value = response.data.content || []; loadingRef.value = false; diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue index 09e73d79..45ec0a5c 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue @@ -90,7 +90,7 @@ const changeFirstColMaxWidth = () => { const refresh = () => { loadingRef.value = true; axios - .get(Environment.apiContextPath('/api/flowable/process/query/myTask?page=1&size=10&pageable=true')) + .get(Environment.apiContextPath('/api/flowable/process/query/myTask?page=1&size=10&pageable=true&sortBy=-startTime')) .then((response: any) => { itemsRef.value = response.data.content || []; loadingRef.value = false; diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index d0257b82..955113cc 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.121", + "version": "8.2.122", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index c82ce790..64c5d051 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.doc", - "version": "8.2.31", + "version": "8.2.32", "description": "", "main": "index.js", "scripts": { @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 03f2e0e8..e936970a 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java index 4f079eab..ea87f65d 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessOperationServiceImpl.java @@ -67,7 +67,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { @Autowired private AgentService agentService; @Autowired private ApplicationContext applicationContext; @Autowired private ObjectMapper jsonMapper; - + @Override @Transactional public ProcessInstance startProcessByKey(String processDefinitionKey, String bussinessKey,Map variables, Map transientVariables) throws Exception { @@ -81,7 +81,6 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { ProcessInstanceBuilder builder =runtimeService.createProcessInstanceBuilder(); builder.processDefinitionKey(processDefinitionKey); builder.businessKey(bussinessKey); - //builder.name(getNameByProcessDefinitionKey(processDefinitionKey,bussinessKey)); if(variables!=null){ builder.variables(variables); } @@ -91,7 +90,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { insertProcInsExtByDefinitionKey(processDefinitionKey,processInstance.getId(),bussinessKey); return startProcess(processInstance,variables,transientVariables,autoCompleteFirstTask); } - + @Override @Transactional public ProcessInstance startProcessById(String processDefinitionId, String bussinessKey,Map variables, Map transientVariables) throws Exception { @@ -105,37 +104,36 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { ProcessInstanceBuilder builder =runtimeService.createProcessInstanceBuilder(); builder.processDefinitionId(processDefinitionId); builder.businessKey(bussinessKey); - //builder.name(getNameByProcessDefinitionId(processDefinitionId,bussinessKey)); if(variables!=null){ builder.variables(variables); } - + builder.transientVariables(convertTransientVariables(variables,transientVariables)); - + ProcessInstance processInstance =builder.start(); insertProcInsExtByDefinitionId(processDefinitionId,processInstance.getId(),bussinessKey); return startProcess(processInstance,variables,transientVariables,autoCompleteFirstTask); } - + private Map convertTransientVariables(Map variables,Map transientVariables){ Map _transientVariables =new HashMap(); if(transientVariables!=null){ _transientVariables.putAll(transientVariables); } - + if(!_transientVariables.containsKey(FrameworkVariableNames.GO_BACK) && (variables==null || !variables.containsKey(FrameworkVariableNames.GO_BACK))){ _transientVariables.put(FrameworkVariableNames.GO_BACK, Integer.MIN_VALUE); } if(!_transientVariables.containsKey(FrameworkVariableNames.ASSIGNEE) && (variables==null || !variables.containsKey(FrameworkVariableNames.ASSIGNEE))){ _transientVariables.put(FrameworkVariableNames.ASSIGNEE, null); } - + if(_transientVariables.containsKey(FrameworkVariableNames.FIRST_TASK_ASSIGNEE)) { _transientVariables.put(FrameworkVariableNames.ASSIGNEE, _transientVariables.get(FrameworkVariableNames.FIRST_TASK_ASSIGNEE)); } return _transientVariables; } - + private ProcessInstance startProcess(ProcessInstance processInstance,Map variables, Map transientVariables,boolean autoCompleteFirstTask) throws Exception{ List tasks =taskService.createTaskQuery().processInstanceId(processInstance.getId()).includeProcessVariables().list(); //如果未找到新任务,表示流程结束,正常返回 @@ -148,14 +146,14 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } //获取到产生的新任务 Task newTask =tasks.get(0); - + //如果需要,自动完成第一个任务 if(autoCompleteFirstTask) { newTask.setAssignee((String)transientVariables.get(FrameworkVariableNames.FIRST_TASK_ASSIGNEE)); completeTask(newTask.getId(),variables,transientVariables); return processInstance; } - + //如果新任务已经成功分配到了处理人,正常返回 if(StringUtils.hasText(newTask.getAssignee())){ //查找代理人 @@ -165,7 +163,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } return processInstance; } - + String taskDefinitionKey =newTask.getTaskDefinitionKey(); String procDefinitionId =newTask.getProcessDefinitionId(); //获取到流程定义模型对象 @@ -183,10 +181,10 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(newUserTaskDefinition==null){ return processInstance; } - + //获取查询任务候选处理人 spring 服务 bean AssigneeQueryService assigneeQueryService =getAssignmentStrategySpringBean(model,processInstance,newUserTaskDefinition); - + //查找候选处理人 List assignees =assigneeQueryService.query(null,newTask, newUserTaskDefinition); @@ -216,23 +214,23 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(transientVariables==null){ transientVariables =new HashMap(); } - + if(!transientVariables.containsKey(FrameworkVariableNames.GO_BACK) && (variables==null || !variables.containsKey(FrameworkVariableNames.GO_BACK))){ transientVariables.put(FrameworkVariableNames.GO_BACK, Integer.MIN_VALUE); } if(!transientVariables.containsKey(FrameworkVariableNames.ASSIGNEE) && (variables==null || !variables.containsKey(FrameworkVariableNames.ASSIGNEE))){ transientVariables.put(FrameworkVariableNames.ASSIGNEE, null); } - + //获取当前任务 Task task =taskService.createTaskQuery().taskId(taskId).singleResult(); - + //设置处理意见 Object treatment =transientVariables.get(FrameworkVariableNames.TASK_TREATMENT); if(treatment!=null && StringUtils.hasText((String)treatment)) { taskService.addComment(taskId, task.getProcessInstanceId(), (String)treatment); } - + //尝试完成任务 taskService.complete(taskId,variables,transientVariables); //获取流程是否允许领取任务 @@ -240,10 +238,10 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(canClaimTask){ return; } - + //通过当前任务获取流程实例ID String procInstId =task.getProcessInstanceId(); - + //获取当前任务完成后产生的的新任务 List tasks =taskService.createTaskQuery().processInstanceId(procInstId).list(); //如果未找到新任务,表示流程结束,正常返回 @@ -256,7 +254,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } //获取到产生的新任务 Task newTask =tasks.get(0); - + //如果新任务已经成功分配到了处理人,正常返回 if(StringUtils.hasText(newTask.getAssignee())){ AgentEntity agent =getAgent(newTask.getAssignee()); @@ -265,7 +263,10 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } return; } - + + //是否是退回操作 + boolean isReturn =isReturn(task,newTask); + //如果未分配到单一的一个处理人,需要根据流程定义查找可用的处理人 String taskDefinitionKey =newTask.getTaskDefinitionKey(); String procDefinitionId =newTask.getProcessDefinitionId(); @@ -284,7 +285,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(newUserTaskDefinition==null){ return; } - + //如果该节点存在历史任务，表示流程重新回到此节点， //此时应该将任务尽可能的分配给原处理人 List historyTasks =historyService.createHistoricTaskInstanceQuery().processInstanceId(procInstId).taskDefinitionKey(taskDefinitionKey).orderByHistoricTaskInstanceEndTime().desc().list(); @@ -299,7 +300,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } } String historyAssignee =historyTask.getAssignee(); - if(StringUtils.hasText(historyAssignee)) { + if(StringUtils.hasText(historyAssignee) && isReturn) { AgentEntity agent =getAgent(historyAssignee); if(agent!=null){ taskService.setAssignee(newTask.getId(), agent.getAgentLoginName()); @@ -309,11 +310,11 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { return; } } - + //获取查询任务候选处理人 spring 服务 bean ProcessInstance processInstance =runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult(); AssigneeQueryService assigneeQueryService =getAssignmentStrategySpringBean(model,processInstance,newUserTaskDefinition); - + //查找候选处理人 List assignees =assigneeQueryService.query(task,newTask, newUserTaskDefinition); //是否强制选择候选处理人(即只有一个候选人也需要用户选择) @@ -337,13 +338,13 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { public void claimTask(String taskId) throws Exception { taskService.claim(taskId, SecurityUtil.getLoginName()); } - + @Override @Transactional public void unClaimTask(String taskId) throws Exception { taskService.unclaim(taskId); } - + @Override @Transactional public void terminateProcessInstance(String taskId,String deleteReason) throws Exception { @@ -353,6 +354,84 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } } + /** + * 判断节点间连线是否是回退操作 + * @param fromTask from 任务 + * @param toTask to 任务 + * @return 是否是回退操作 + */ + private boolean isReturn(Task fromTask,Task toTask){ + if(fromTask==null || toTask==null){ + return false; + } + // from 节点 KEY + String fromTaskDefinitionKey =fromTask.getTaskDefinitionKey(); + if(!StringUtils.hasText(fromTaskDefinitionKey)){ + return false; + } + + // to 节点 Key + String toTaskDefinitionKey =toTask.getTaskDefinitionKey(); + if(!StringUtils.hasText(toTaskDefinitionKey)){ + return false; + } + + //获取流程定义模型对象 + BpmnModel model = repositoryService.getBpmnModel(fromTask.getProcessDefinitionId()); + if(model==null){ + return false; + } + //获取所有元素 + Collection elements =model.getMainProcess().getFlowElements(); + if(elements==null || elements.size()==0){ + return false; + } + //查找 from 任务的节点 + UserTask fromUserTaskDefinition =null; + if(elements!=null && elements.size()>0){ + for(FlowElement element : elements){ + if(fromTaskDefinitionKey.equals(element.getId()) && (element instanceof UserTask)){ + fromUserTaskDefinition =(UserTask)element; + break; + } + } + } + if(fromUserTaskDefinition==null){ + return false; + } + //查找 to 任务的节点 + UserTask toUserTaskDefinition =null; + if(elements!=null && elements.size()>0){ + for(FlowElement element : elements){ + if(toTaskDefinitionKey.equals(element.getId()) && (element instanceof UserTask)){ + toUserTaskDefinition =(UserTask)element; + break; + } + } + } + if(toUserTaskDefinition==null){ + return false; + } + // 查找从 from 到 to 的线 + SequenceFlow from2toFlow =null; + List flows =fromUserTaskDefinition.getOutgoingFlows(); + for(SequenceFlow flow : flows){ + if(toTaskDefinitionKey.equals(flow.getTargetFlowElement().getId())){ + from2toFlow =flow; + break; + } + } + if(from2toFlow==null){ + return false; + } + // 获取线上配置的 goback 值 + Integer value =parseGobackVariableValue(from2toFlow.getConditionExpression()); + if(value==null){ + return false; + } + return value<0; + } + @Override @Transactional public List getGobacks(String taskId) throws Exception { @@ -364,23 +443,23 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(task==null){ return null; } - + String taskDefinitionKey =task.getTaskDefinitionKey(); if(!StringUtils.hasText(taskDefinitionKey)){ return null; } - + //获取流程定义模型对象 BpmnModel model = repositoryService.getBpmnModel(task.getProcessDefinitionId()); if(model==null){ return null; } - + Collection elements =model.getMainProcess().getFlowElements(); if(elements==null || elements.size()==0){ return null; } - + UserTask userTaskDefinition =null; if(elements!=null && elements.size()>0){ for(FlowElement element : elements){ @@ -397,7 +476,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { if(flows==null || flows.size()==0){ return null; } - + List gobacks =new ArrayList(); for(SequenceFlow flow : flows){ Integer value =parseGobackVariableValue(flow.getConditionExpression()); @@ -423,7 +502,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { }); return gobacks; } - + @Override @Transactional public void jumpTask(String taskId, String targetActivityId, String targetAssignee) throws Exception { @@ -472,7 +551,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } jdbcTemplate.update("insert into SYS_PROCESS_INST_EXT(PROC_INST_ID_,CUST_NO_,CUST_NAME_) values(?,?,?)",processInstanceId,wrapper.getCustNo(),wrapper.getCustName()); } - + private AssigneeQueryService getAssignmentStrategySpringBean(BpmnModel model,ProcessInstance processInstance,UserTask taskDefine) { String beanName =DEFAULT_ASSIGNMENT_STRATEGY_SPRING_BEAN_NAME; String processDefinitionKey =processInstance.getProcessDefinitionKey(); @@ -531,7 +610,7 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { } return null; } - + private Integer parseGobackVariableValue(String conditionExpression){ if(StringUtils.hasText(conditionExpression)){ Matcher matcher = GO_BACK_VARIABLE_PATTERN.matcher(conditionExpression); diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java index 2e1dd774..fae7fb5c 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java @@ -233,7 +233,6 @@ public class ProcessQueryServiceImpl implements ProcessQueryService { } public Page queryProcessTasks(QueryParameter queryParameter) throws Exception { - runtimeService.createProcessInstanceQuery().processInstanceId("").list(); Map> fieldTypeMap =new HashMap<>(); fieldTypeMap.put("processDefinitionId",String.class); fieldTypeMap.put("processInstanceId",String.class); diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 45330a84..f80a4831 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.lcdp.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue index 57aa49de..4257b926 100644 --- a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue +++ b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue @@ -7,7 +7,6 @@ - @@ -788,8 +733,6 @@ const selectedTabRef = ref('processDefine'); const processDefineGridRef = ref(); const processInstanceGridRef = ref(); const taskGridRef = ref(); -const workbenchProcessDefineGridRef = ref(); -const workbenchProcessStatusGridRef = ref(); const variableDialogRef = ref(); const completeTaskDialogRef = ref(); diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 9ee8069e..d9bd3a32 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.license.keygen.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java b/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java index 2289b46b..baed2ab2 100644 --- a/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java +++ b/io.sc.platform.license.keygen/src/main/java/io/sc/platform/license/keygen/controller/LicenseKeyGeneratorWebController.java @@ -133,7 +133,7 @@ public class LicenseKeyGeneratorWebController { queryParameter.addCriterias(criterias); } ByteArrayOutputStream outputStream =new ByteArrayOutputStream(); - DataExportConfigure cofigure =licenseService.export(queryParameter,outputStream); + DataExportConfigure cofigure =licenseService.export(queryParameter,outputStream,null); if(cofigure==null){ return; } diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index f695f9d8..b4a0906e 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.mvc.frontend", - "version": "8.2.31", + "version": "8.2.32", "description": "", "private": false, "keywords": [], @@ -113,7 +113,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.121", + "platform-core": "8.2.122", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java index 31c9933e..3c2bc960 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java @@ -670,7 +670,7 @@ public abstract class DaoServiceImpl