From b3e36520821708a645b4ad230c2f7663267795c2 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 29 Jul 2025 11:51:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4624)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=9A=E5=8A=A1=E5=88=86=E7=B1=BB=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=A5=E5=8F=82=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/workflow/core/service/impl/CategoryServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); }