fix bug

laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java

@@ -264,13 +264,19 @@ public class ActivitiController {
     @DictPoint
     @GetMapping("/getNodeList")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义key"),
             @ApiImplicitParam(name = "processDefinitionId", value = "流程定义id"),
             @ApiImplicitParam(name = "processInstanceId", value = "流程实例id(这个参数会去查绑定好的用户)")
     })
     @ApiOperation("获得节点列表")
-    public Result<List<ProcessNode>> getNodeList(String processDefinitionId,String processInstanceId) {
+    public Result<List<ProcessNode>> getNodeList(String processDefinitionKey,String processDefinitionId,String processInstanceId) {
+        if (StringUtils.isBlank(processDefinitionId)){
+            processDefinitionId = repositoryService.createProcessDefinitionQuery() // 创建部署信息查询器
+                    .processDefinitionKey(processDefinitionKey) // 根据流程部署key查询
+                    .latestVersion() // 根据版本倒序取最后一个版本
+                    .singleResult().getId();
+        }
         //查询节点信息
-
         List<ProcessNode> nodeList = processNodeService.getNodeList(processDefinitionId,processInstanceId);
         return Result.OK(nodeList);
     }

laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
@@ -18,9 +17,7 @@ import com.jero.modules.activiti.vo.ResolveTaskParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.task.Task;
-import org.activiti.engine.task.TaskQuery;
+import org.activiti.engine.history.HistoricTaskInstance;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
@@ -28,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;