wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 处理模型列表查询报错的问题

Browse Source
This commit is contained in:
wangli 2023-12-05 17:18:05 +08:00
parent 3db128ed1f
commit 3162e078c6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnNativeQueryUtil.java
View File

@ -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";

6
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java
View File

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