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 22:17:40 +08:00
parent 80c60d5156
commit eb6a0a2102
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ public class BpmnNativeQueryUtil {
public static String sqlConnectors(StringBuilder stringBuilder) {
if (stringBuilder.indexOf("ON") < 0 && stringBuilder.indexOf("WHERE") < 0) {
return " WHERE";
} else if (stringBuilder.indexOf("LEFT") >= 0 && stringBuilder.indexOf("ON") < 0) {
} else if (stringBuilder.indexOf("JOIN") >= 0 && stringBuilder.indexOf("ON") < 0) {
return " ON";
}
return " AND";
@ -20,7 +20,7 @@ public class BpmnNativeQueryUtil {
if ((start = stringBuilder.indexOf("SELECT")) < 0) {
return stringBuilder.toString();
}
if (stringBuilder.indexOf("LEFT JOIN") < 0) {
if (stringBuilder.indexOf("JOIN") < 0) {
return stringBuilder.replace(start + 7, 8, "count(1)").toString();
} else {
return stringBuilder.replace(start + 7, 10, "count(1)").toString();

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

@ -87,7 +87,7 @@ public class BpmnProcessModelServiceImpl implements BpmnProcessModelService {
.append(tableName).append(" a ");
NativeModelQuery query = repositoryService.createNativeModelQuery();
if (Objects.nonNull(dto.getStatus())) {
baseQuerySql.append(" LEFT JOIN ext_ax_re_model b ON a.ID_ = b.model_id ")
baseQuerySql.append(" INNER JOIN ext_ax_re_model b ON a.ID_ = b.model_id ")
.append(sqlConnectors(baseQuerySql))
.append(" b.status = #{status}");
query.parameter("status", dto.getStatus() == 1);
@ -100,7 +100,7 @@ public class BpmnProcessModelServiceImpl implements BpmnProcessModelService {
if (StringUtils.hasLength(dto.getName())) {
baseQuerySql.append(sqlConnectors(baseQuerySql))
.append(" a.NAME_ = #{name}");
query.parameter("name", dto.getName());
query.parameter("name", "%" + dto.getName() + "%");
}
if (!CollectionUtils.isEmpty(dto.getCategories())) {
baseQuerySql.append(sqlConnectors(baseQuerySql))

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java
View File

@ -158,7 +158,7 @@ public class CategoryServiceImpl extends ServiceImpl<ExtAxDictMapper, ExtAxDict>
public List<CategoryItemVO> list(CategorySearchDTO dto) {
LambdaQueryWrapper<ExtAxDict> queryWrapper = Wrappers.lambdaQuery(ExtAxDict.class)
.eq(StringUtils.isNotBlank(dto.getDictType()), ExtAxDict::getType, dto.getDictType())
.eq(StringUtils.isNotBlank(dto.getLabel()), ExtAxDict::getLabel, dto.getLabel())
.like(StringUtils.isNotBlank(dto.getLabel()), ExtAxDict::getLabel, dto.getLabel())
.eq(StringUtils.isNotBlank(dto.getValue()), ExtAxDict::getValue, dto.getValue())
.eq(Objects.nonNull(dto.getStatus()), ExtAxDict::getStatus, dto.getStatus())
.eq(StringUtils.isNotBlank(dto.getWorkspaceTypeCode()), ExtAxDict::getWorkspaceTypeCode,