From ab69f1641555fca13b8747a6ee2f4a32e40ad9fc Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Sun, 30 Mar 2025 10:11:04 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BC=98=E5=8C=96=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=94=9F=E6=88=90=E8=A7=A6=E5=8F=91=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8Bcode=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/bo/AiLabelPostBindBo.java | 2 +- .../service/impl/AiLablePostServiceImpl.java | 18 ++++++++++++------ .../org/dromara/workflow/domain/FlowLabel.java | 1 - .../service/impl/FlwLabelServiceImpl.java | 13 ++++++++----- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java b/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java index 0f6a117..95a8c63 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java @@ -17,7 +17,7 @@ public class AiLabelPostBindBo { private Long postId; - @NotNull(message = "标签不能为空") +// @NotNull(message = "标签不能为空") private List lableIdList; } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java index b5cc7b5..879c29a 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java @@ -154,13 +154,19 @@ public class AiLablePostServiceImpl implements IAiLabelPostService { public Boolean insertByBatchBo(AiLabelPostBindBo aiLabelPostBindBo) { delPostId(aiLabelPostBindBo.getPostId()); List resultlist = new ArrayList<>(); - for (Long labelId : aiLabelPostBindBo.getLableIdList()) { - AiLabelPost ailabelPost = new AiLabelPost(); - ailabelPost.setPostId(aiLabelPostBindBo.getPostId()); - ailabelPost.setLabelId(labelId); - resultlist.add(ailabelPost); + + if (ObjectUtil.isNotEmpty(aiLabelPostBindBo.getLableIdList())){ + for (Long labelId : aiLabelPostBindBo.getLableIdList()) { + AiLabelPost ailabelPost = new AiLabelPost(); + ailabelPost.setPostId(aiLabelPostBindBo.getPostId()); + ailabelPost.setLabelId(labelId); + resultlist.add(ailabelPost); + } + + return this.baseMapper.insertBatch(resultlist); } - return this.baseMapper.insertBatch(resultlist); + + return true; } @Override diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java index 3476833..d04d1ee 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java @@ -37,7 +37,6 @@ public class FlowLabel { /** * 部门id集合 */ - @NotNull(message = "标签id不能为空", groups = AddGroup.class) @TableField(value = "label_ids",typeHandler = ListTypeHandler.class) List labelIds; } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java index 2cabe80..1eebe4f 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.workflow.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; @@ -30,12 +31,14 @@ public class FlwLabelServiceImpl extends ServiceImpl updateWrapper.eq(FlowLabel::getFlowCode, flowDepart.getFlowCode()); this.baseMapper.delete(updateWrapper); - //查询部门是否还存在别的流程 - if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){ - throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!"); - } + if (ObjectUtil.isNotEmpty(flowDepart.getLabelIds())) { + //查询部门是否还存在别的流程 + if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){ + throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!"); + } - this.baseMapper.insert(flowDepart); + this.baseMapper.insert(flowDepart); + } return flowDepart; }