From 66961e658270b0c3d61ed108c164903815e4fdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= Date: Thu, 25 Jul 2024 16:24:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(REQ-2774):=20=E5=A2=9E=E5=8A=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E5=BD=95=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/model/req/PermissionOperateLogReq.java | 4 +++- .../SaasPgroupPermissionRelationOperateLogServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PermissionOperateLogReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PermissionOperateLogReq.java index 94be5f61..61cbeb10 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PermissionOperateLogReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PermissionOperateLogReq.java @@ -33,5 +33,7 @@ public class PermissionOperateLogReq { private String sceneId; - private JSONObject operateData; + private Object requestData; + + private Object operateData; } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationOperateLogServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationOperateLogServiceImpl.java index bbab6c85..390dbc9a 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationOperateLogServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPgroupPermissionRelationOperateLogServiceImpl.java @@ -90,7 +90,7 @@ public class SaasPgroupPermissionRelationOperateLogServiceImpl implements SaasPg .createBy(req.getOperatorId()) .createByName(Objects.isNull(operator) ? "" : operator.getRealName()) .traceId(MDC.get(Constants.CTX_LOG_ID_MDC)) - .requestData(JSONObject.toJSONString(req)) + .requestData(Objects.nonNull(req.getRequestData()) ? JSONObject.toJSONString(req.getRequestData()) : null) .operateData(Objects.nonNull(req.getOperateData()) ? JSONObject.toJSONString(Lists.newArrayList(req.getOperateData())) : null) .createByRole(JSONObject.toJSONString(getPersonBasicRoles(req.getOperatorId()))) .build();