Преглед на файлове

撤回按钮状态调整

dzx преди 1 година
родител
ревизия
0a4b317214

+ 5 - 2
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3530,8 +3530,11 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                             vo.setProcessId(e.getProcessId());
                             vo.setProcessName(e.getProcessName());
                             vo.setIsApproval(0);
-                            Integer taskCount = workflowRecordMapper.getTaskCount(e.getTaskId());
-                            if(taskCount > 1){
+                            List<WorkflowApproveRecord> list = approveRecordService.list(
+                                    new QueryWrapper<WorkflowApproveRecord>().lambda()
+                                            .eq(WorkflowApproveRecord::getProcessId, e.getProcessId())
+                            );
+                            if(list.size() > 1){
                                 vo.setIsApproval(1);
                             }
                             //如果是已经完成的任务 默认是100进度

+ 1 - 1
src/test/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImplTest.java

@@ -18,6 +18,6 @@ class WorkflowExecuteServiceImplTest {
     @Test
     public void testDeleteTask(){
         //taskService.deleteTask("8abd7148-e58b-11ee-a00e-0242c8000007");
-        runtimeService.deleteProcessInstance("8a8990df-e58b-11ee-a00e-0242c8000007", "该流程已经停止");
+        runtimeService.deleteProcessInstance("45a1a081-f8a0-11ee-92e5-0242d200000c", "该流程已经停止");
     }
 }