diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessDefinitionApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessDefinitionApi.java
index ee6a63fab..96157016b 100644
--- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessDefinitionApi.java
+++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessDefinitionApi.java
@@ -92,6 +92,6 @@ public interface ProcessDefinitionApi {
      * @return 流程定义ID
      */
     @GetMapping("/api/process/definition/active/json/model")
-    CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(@NotBlank(message = "租户不能为空") @RequestParam String tenantId,
-                                                                      @NotBlank(message = "分类不能为空") @RequestParam String category);
+    CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(@NotBlank(message = "租户不能为空") @RequestParam(required = false) String tenantId,
+                                                                      @RequestParam(required = false) String category);
 }
diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java
index f69cb2dd5..81035bf3e 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java
@@ -49,5 +49,5 @@ public class BpmnModelCreateDTO {
      * 租户Id
      */
     @ApiModelProperty(value = "租户Id", example = "1")
-    private String tenantId = "0";//0 代表公共模型
+    private String tenantId = "";
 }
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
index 0529db42f..059b3b123 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
@@ -16,6 +16,7 @@ import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.common.engine.impl.db.SuspensionState;
 import org.flowable.engine.impl.util.ProcessDefinitionUtil;
 import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -153,7 +154,8 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
     @GetMapping("/api/process/definition/active/json/model")
     @Override
     public CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(String tenantId, String category) {
-        String activeProcessDefinitionId = bpmnProcessDefinitionService.getActiveProcessDefinitionId(tenantId,
+        String finalTenantId = StringUtils.hasLength(tenantId) ? tenantId : "";
+        String activeProcessDefinitionId = bpmnProcessDefinitionService.getActiveProcessDefinitionId(finalTenantId,
                 category);
         BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(activeProcessDefinitionId);
         return success(BpmnJsonConverterUtil.convertToJson(bpmnModel));