From 07f86ce39b9626666c1dc36f6e9e5cfc1f284800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Wed, 5 Feb 2025 15:11:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:(feature/REQ-3282)=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=9B=B4=E6=96=B0=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=8A=8A?=
 =?UTF-8?q?=E6=96=B0=E6=97=A7=E7=9A=84values=E8=AE=B0=E5=BD=95=E4=B8=8B?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SaasRoleUserRelationServiceImpl.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
index 50e9da35..41988118 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
@@ -218,7 +218,8 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
         Map<String, SaasRoleRes> roles = checkRoleCode(param);
 
         // 查询用户的历史记录
-        Map<String, List<SaasRoleUserV2DTO>> roleUserMap = listRoleUserRelation(param).stream()
+        List<SaasRoleUserV2DTO> oldRoleUsers = listRoleUserRelation(param);
+        Map<String, List<SaasRoleUserV2DTO>> roleUserMap = oldRoleUsers.stream()
                 .collect(Collectors.groupingBy(e -> e.getIdentityId() + "_" + e.getIdentityType() +
                         "_" + e.getSaasRoleUser().getPersonId() + "_" + e.getWorkspaceId() + "_" + e.getOuId()));
         // 根据入参解析insert、delete的记录
@@ -272,7 +273,8 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
                         .collect(Collectors.toList()))
                 .message(new JSONObject()
                         .fluentPut("param", param)
-                        .fluentPut("upsert", upsert)
+                        .fluentPut("oldValues", oldRoleUsers)
+                        .fluentPut("newValues", upsert)
                         .toJSONString())
                 .build());
     }
@@ -932,9 +934,9 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
      * @param upsert
      */
     private void assembleDeleteData(Map<String, List<SaasRoleUserV2DTO>> roleUserMap,
-                                                          UpsertUserRoleReq param,
-                                                          Map<String, SaasRoleRes> roles,
-                                                          List<SaasRoleUserRelation> upsert) {
+                                    UpsertUserRoleReq param,
+                                    Map<String, SaasRoleRes> roles,
+                                    List<SaasRoleUserRelation> upsert) {
         List<SaasRoleUserRelation> resultByRemoveRoles = param.getUserRoles().stream()
                 .flatMap(e -> {
                     Set<Long> allRemoveRoleIds = Optional.ofNullable(e.getRemoveRoleIds())