From 3162e078c663e1e30495a6cdd1b0ad8406dccd0f Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 5 Dec 2023 17:18:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=A4=84=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/core/common/utils/BpmnNativeQueryUtil.java     | 2 +-
 .../core/service/impl/BpmnProcessModelServiceImpl.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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<BpmnModelDetailVO> 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))