From 3cbfc1624bb7a23a4dfa62ec4558578b00be56b3 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 04 三月 2025 21:59:55 +0800 Subject: [PATCH] 流程日志查询bug、督办日志bug --- business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java index 9773792..f67a65e 100644 --- a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java @@ -178,12 +178,15 @@ } else if (ProcessLogEventTypeEnum.REJECT.equals(log.getEventType())) { log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), RejectData.class)); } else if (ProcessLogEventTypeEnum.SUPERVISE.equals(log.getEventType())) { - SuperviseData superviseData = JSON.parseObject(log.getEventDataJson(), SuperviseData.class); - SysUser user = userService.selectUserById(Long.parseLong(superviseData.getSenderId())); - if (Objects.nonNull(user)) { - superviseData.setSenderName(user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "鏃犻儴闂�") + ")"); + List<SuperviseData> superviseDataList = JSON.parseArray(log.getEventDataJson(), SuperviseData.class); + if (CollectionUtils.isNotEmpty(superviseDataList)) { + SysUser user = userService.selectUserById(Long.parseLong(superviseDataList.get(0).getSenderId())); + if (Objects.nonNull(user)) { + superviseDataList.get(0).setSenderName(user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "鏃犻儴闂�") + ")"); + } + log.setEventDataObj(superviseDataList.get(0)); } - log.setEventDataObj(superviseData); + } else if (ProcessLogEventTypeEnum.HANGUP.equals(log.getEventType())) { log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), HangupData.class)); } -- Gitblit v1.8.0