From e15bad7def6ccc29f4fd24b29ecc5d4450ade879 Mon Sep 17 00:00:00 2001
From: zuoqinbo <zuoqinbo@axzo.cn>
Date: Thu, 7 Dec 2023 15:18:58 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=88=A0=E9=99=A4=E8=A7=92=E8=89=B2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java | 7 +++++++
 .../cn/axzo/tyr/server/service/impl/RoleUserService.java   | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java
index 9ad359d8..7357a877 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java
@@ -57,6 +57,13 @@ public class RoleUserReq {
      */
     private Set<Long> updateRoleIds;
 
+    /**
+     * 是否合并当前已存在的角色
+     * 适用于角色更新或者角色新增
+     * 默认true
+     */
+    private boolean mergeExistsRoles = true;
+
 
     /**
      * 该请求是否是权限回收
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
index b288e2f3..ecfe7f97 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
@@ -88,8 +88,10 @@ public class RoleUserService implements SaasRoleUserService {
             }
             roleUserRelationDao.deleteByUser(workspaceModel, notAdminRole);
         }
-        //合并 新的角色和老的角色
-        updateRoleIds.addAll(notAdminRole);
+        if(req.isMergeExistsRoles()){
+            //合并新的角色和老的角色
+            updateRoleIds.addAll(notAdminRole);
+        }
         // 清空所有角色
         if (CollectionUtil.isEmpty(updateRoleIds)) {
             return;