diff --git a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java index 059fe97..c09cb94 100644 --- a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java +++ b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java @@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.UserTask; import org.flowable.engine.repository.Deployment; +import org.flowable.engine.repository.Model; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -84,11 +85,15 @@ public class BpmProcessDefinitionController { return success(Collections.emptyList()); } + // 获得 Category Map + Map categoryMap = categoryService.getCategoryMap( + convertSet(list, ProcessDefinition::getCategory)); + // 获得 BpmProcessDefinitionInfoDO Map Map processDefinitionMap = processDefinitionService.getProcessDefinitionInfoMap( convertSet(list, ProcessDefinition::getId)); return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionList( - list, null, processDefinitionMap, null, null)); + list, null, processDefinitionMap, null, categoryMap)); } @GetMapping ("/get") diff --git a/imt-ui/src/views/bpm/model/index.vue b/imt-ui/src/views/bpm/model/index.vue index 28dde72..77afb44 100644 --- a/imt-ui/src/views/bpm/model/index.vue +++ b/imt-ui/src/views/bpm/model/index.vue @@ -44,11 +44,7 @@ - - - + - - - +