From f03503c4b73083869b70af54e83fd4499651c2a9 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Tue, 15 Oct 2024 16:58:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86):=20=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=A7=BB=E5=87=BA=E7=BB=84=E7=BB=87/=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=8C=87=E6=B4=BE=E7=BB=99=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E5=B7=A5=E4=BD=9C=E9=A1=B9/?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AF=A5=E6=80=8E=E4=B9=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用户离开组织后重新加入组织未更新用户在Forge组织的权限

Signed-off-by: OTTO <731554297@qq.com>
---
 .../service/impl/SysUserDeptRoleServiceImpl.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
index 0d6aec7e2..0e56bf55a 100644
--- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
+++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
@@ -432,12 +432,6 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService {
                 sysUserDeptRoleMapper.selectUserIdentityByAllStatus(sysUserDeptRoleInput.getDeptId(), sysUserDeptRoleInput.getUserId());
         if (sysUserDeptRole == null) {
             success += insertSysUserDeptRoleDatabase(sysUserDeptRoleInput);
-            updateUserGitLinkRole(
-                    sysUserDeptRoleInput.getUserId()
-                    , sysUserDeptRoleInput.getDeptId()
-                    , null
-                    , sysUserDeptRoleInput.getRoleId()
-                    , OPERATE_ADD);
         } else {
             if (sysUserDeptRole.getSysRole() != null && SystemRole.isVirtual(sysUserDeptRole.getSysRole().getRoleKey())) {
                 updateSysUserDeptRole(sysUserDeptRoleInput);
@@ -449,6 +443,12 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService {
             }
             success++;
         }
+        updateUserGitLinkRole(
+                sysUserDeptRoleInput.getUserId()
+                , sysUserDeptRoleInput.getDeptId()
+                , null
+                , sysUserDeptRoleInput.getRoleId()
+                , OPERATE_ADD);
         return success;
     }