diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java index 3de68514c..a9b68997e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java @@ -221,14 +221,17 @@ public class CategoryServiceImpl extends ServiceImpl .eq(StringUtils.isNotBlank(dto.getDictType()), ExtAxDict::getType, dto.getDictType()) .like(StringUtils.isNotBlank(dto.getLabel()), ExtAxDict::getLabel, dto.getLabel()) .eq(StringUtils.isNotBlank(dto.getValue()), ExtAxDict::getValue, dto.getValue()) + .in(!CollectionUtils.isEmpty(dto.getValues()), ExtAxDict::getValue, dto.getValues()) .eq(Objects.nonNull(dto.getStatus()), ExtAxDict::getStatus, dto.getStatus()) .eq(StringUtils.isNotBlank(dto.getWorkspaceTypeCode()), ExtAxDict::getWorkspaceTypeCode, dto.getWorkspaceTypeCode()) + .in(!CollectionUtils.isEmpty(dto.getWorkspaceTypeCodes()), ExtAxDict::getWorkspaceTypeCode, dto.getWorkspaceTypeCodes()) .eq(ExtAxDict::getTenantId, dto.getTenantId()) .eq(dto.getBusinessType() != null, ExtAxDict::getBusinessType, dto.getBusinessType()) + .in(!CollectionUtils.isEmpty(dto.getBusinessTypes()), ExtAxDict::getBusinessType, dto.getBusinessTypes()) .eq(ExtAxDict::getIsDelete, 0) .orderByDesc(Objects.equals(dto.getOrderCreateAt(), "desc"), ExtAxDict::getCreateAt); - ; + ; List extAxDicts = dictMapper.selectList(queryWrapper); return categoryConverter.toVos(extAxDicts); }