!135 【工作流】:流程模型分页数量查询不正确
Merge pull request !135 from 今晚打老虎/master-jdk17
This commit is contained in:
@@ -63,6 +63,7 @@ public class BpmModelServiceImpl implements BpmModelService {
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<Model> getModelPage(BpmModelPageReqVO pageVO) {
|
public PageResult<Model> getModelPage(BpmModelPageReqVO pageVO) {
|
||||||
ModelQuery modelQuery = repositoryService.createModelQuery();
|
ModelQuery modelQuery = repositoryService.createModelQuery();
|
||||||
|
modelQuery.modelTenantId(FlowableUtils.getTenantId());
|
||||||
if (StrUtil.isNotBlank(pageVO.getKey())) {
|
if (StrUtil.isNotBlank(pageVO.getKey())) {
|
||||||
modelQuery.modelKey(pageVO.getKey());
|
modelQuery.modelKey(pageVO.getKey());
|
||||||
}
|
}
|
||||||
@@ -78,7 +79,6 @@ public class BpmModelServiceImpl implements BpmModelService {
|
|||||||
return PageResult.empty(count);
|
return PageResult.empty(count);
|
||||||
}
|
}
|
||||||
List<Model> models = modelQuery
|
List<Model> models = modelQuery
|
||||||
.modelTenantId(FlowableUtils.getTenantId())
|
|
||||||
.orderByCreateTime().desc()
|
.orderByCreateTime().desc()
|
||||||
.listPage(PageUtils.getStart(pageVO), pageVO.getPageSize());
|
.listPage(PageUtils.getStart(pageVO), pageVO.getPageSize());
|
||||||
return new PageResult<>(models, count);
|
return new PageResult<>(models, count);
|
||||||
|
|||||||
Reference in New Issue
Block a user