diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnNativeQueryUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnNativeQueryUtil.java index 775e97f06..65549b73c 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnNativeQueryUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnNativeQueryUtil.java @@ -7,7 +7,7 @@ package cn.axzo.workflow.core.common.utils; public class BpmnNativeQueryUtil { public static String sqlConnectors(StringBuilder stringBuilder) { - if (stringBuilder.indexOf("WHERE") < 0) { + if (stringBuilder.indexOf("ON") < 0 && stringBuilder.indexOf("WHERE") < 0) { return " WHERE"; } else if (stringBuilder.indexOf("LEFT") >= 0 && stringBuilder.indexOf("ON") < 0) { return " ON"; diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java index 810605321..fa34c07e8 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java @@ -77,14 +77,14 @@ public class BpmnProcessModelServiceImpl implements BpmnProcessModelService { @Override public BpmPageResult getModelPage(BpmnModelSearchDTO dto) { String tableName = managementService.getTableName(Model.class); - StringBuilder baseQuerySql = new StringBuilder("SELECT * FROM ") + StringBuilder baseQuerySql = new StringBuilder("SELECT a.* FROM ") .append(tableName).append(" a "); NativeModelQuery query = repositoryService.createNativeModelQuery(); if (Objects.nonNull(dto.getStatus())) { - baseQuerySql.append(" LEFT JOIN act_re_model_ext b ON a.ID_ = b.model_id ") + baseQuerySql.append(" LEFT JOIN ext_ax_re_model b ON a.ID_ = b.model_id ") .append(sqlConnectors(baseQuerySql)) .append(" b.status = #{status}"); - query.parameter("status", dto.getStatus()); + query.parameter("status", dto.getStatus() == 1); } if (StringUtils.hasLength(dto.getKey())) { baseQuerySql.append(sqlConnectors(baseQuerySql))