From e2c4a14109f5073c18d5372f4e869956dc44ffd4 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 5 Nov 2024 11:55:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=8A=E6=8A=A5=E4=B8=8D=E4=BC=A0=E4=BC=98?= =?UTF-8?q?=E5=85=88=E7=BA=A7=E6=97=B6=E4=BD=BF=E7=94=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1283212221841408]IT服务-工单上报不传优先级时使用服务的默认优先级 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1283212221841408 --- .../service/ProcessTaskServiceImpl.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index ec6900014..80a6d44ef 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -2615,13 +2615,24 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC 而实际上已经生成工单，只是状态是草稿 */ if (Objects.equals(channelVo.getIsActivePriority(), 1)) { - String priorityUuid = jsonObj.getString("priorityUuid"); - if (StringUtils.isBlank(priorityUuid)) { - throw new ProcessTaskPriorityIsEmptyException(); - } List channelPriorityList = channelMapper.getChannelPriorityListByChannelUuid(channelUuid); - if (channelPriorityList.stream().noneMatch(o -> o.getPriorityUuid().equals(priorityUuid))) { - throw new ProcessTaskPriorityNotMatchException(); + String priorityUuid = jsonObj.getString("priorityUuid"); + if (StringUtils.isNotBlank(priorityUuid)) { + final String priority = priorityUuid; + if (channelPriorityList.stream().noneMatch(o -> o.getPriorityUuid().equals(priority))) { + throw new ProcessTaskPriorityNotMatchException(); + } + } else { + for (ChannelPriorityVo channelPriorityVo : channelPriorityList) { + if (Objects.equals(channelPriorityVo.getIsDefault(), 1)) { + priorityUuid = channelPriorityVo.getPriorityUuid(); + break; + } + } + if (StringUtils.isBlank(priorityUuid)) { + throw new ProcessTaskPriorityIsEmptyException(); + } + jsonObj.put("priorityUuid", priorityUuid); } } else { jsonObj.remove("priorityUuid"); -- Gitee