From 5aec9eb1399c2ec1018d104e63dcfe4b89e9834c Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Sat, 18 Mar 2023 16:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=B5=8B=E8=AF=95=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/operate/ApprovalCallbackOperate.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/operate/ApprovalCallbackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/operate/ApprovalCallbackOperate.java index 8b1b574..d7e4bda 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/operate/ApprovalCallbackOperate.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/operate/ApprovalCallbackOperate.java @@ -140,7 +140,10 @@ public class ApprovalCallbackOperate extends LarkAbstract { Map result = new HashMap<>(); Map colRelation = request.getTableColRelationMap().getOrDefault(request.getTableRelationId(), new HashMap<>()); for (Map.Entry entry : colRelation.entrySet()) { - result.put(entry.getValue(), recursiveValue(bodyMap.get(entry.getValue()), entry.getKey())); + String[] split = entry.getValue().split("@"); + String toColName = split[0]; + String path = split[1]; + result.put(entry.getValue(), recursiveValue(bodyMap.get(toColName), path)); } return result; } @@ -201,15 +204,15 @@ public class ApprovalCallbackOperate extends LarkAbstract { EventLog eventLog = null; if (StringUtils.isBlank(request.getErrorMessage())) { eventService.updateStatus(event.getId(), EventOperateStatus.SUCCESS.getCode(), event.getNumbers()); - eventLog = new EventLog(event.getId(), request.getEventOperateType().getCode(), request.getMessage()); + eventLog = new EventLog(event.getId(), request.getApproveName(), request.getMessage()); } else { eventService.updateStatus(event.getId(), EventOperateStatus.PENDING.getCode(), event.getNumbers() + 1); if (request.getEventOperateType() != null) { - new EventLog(event.getId(), request.getEventOperateType().getCode(), request.getMessage(), request.getErrorCode(), request.getErrorMessage()); + new EventLog(event.getId(), request.getApproveName(), request.getMessage(), request.getErrorCode(), request.getErrorMessage()); } } if (eventLog != null) { - eventLog.setOperateInfo(request.getOperateType()); + eventLog.setOperateInfo(request.getOperateInfo()); eventLogService.insertEventLog(eventLog); } }