Compare commits
4 Commits
master
...
master-jdk
Author | SHA1 | Date | |
---|---|---|---|
|
7295b6a10d | ||
|
7722162bf3 | ||
|
42634c0e3f | ||
|
634ef9b5a8 |
@ -262,7 +262,9 @@ public class BpmModelServiceImpl implements BpmModelService {
|
||||
}
|
||||
|
||||
private Model getModelByKey(String key) {
|
||||
return repositoryService.createModelQuery().modelKey(key).singleResult();
|
||||
return repositoryService.createModelQuery()
|
||||
.modelTenantId(FlowableUtils.getTenantId())
|
||||
.modelKey(key).singleResult();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -79,7 +79,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
|
||||
|
||||
@Override
|
||||
public ProcessDefinition getActiveProcessDefinition(String key) {
|
||||
return repositoryService.createProcessDefinitionQuery().processDefinitionKey(key).active().singleResult();
|
||||
return repositoryService.createProcessDefinitionQuery()
|
||||
.processDefinitionTenantId(FlowableUtils.getTenantId())
|
||||
.processDefinitionKey(key).active().singleResult();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -172,6 +174,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
|
||||
@Override
|
||||
public PageResult<ProcessDefinition> getProcessDefinitionPage(BpmProcessDefinitionPageReqVO pageVO) {
|
||||
ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
|
||||
query.processDefinitionTenantId(FlowableUtils.getTenantId());
|
||||
if (StrUtil.isNotBlank(pageVO.getKey())) {
|
||||
query.processDefinitionKey(pageVO.getKey());
|
||||
}
|
||||
|
@ -30,7 +30,8 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
|
||||
.likeIfPresent(ProductSpuDO::getName, reqVO.getName())
|
||||
.eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
|
||||
.betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(ProductSpuDO::getSort);
|
||||
.orderByDesc(ProductSpuDO::getSort)
|
||||
.orderByDesc(ProductSpuDO::getId);
|
||||
appendTabQuery(tabType, queryWrapper);
|
||||
return selectPage(reqVO, queryWrapper);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user