From d72c0bb5351c4d18e0596c5716bf22a2e142abd0 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Tue, 10 Sep 2024 10:40:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(Bug=E4=BF=AE=E5=A4=8D):=20=E7=89=B9?=
 =?UTF-8?q?=E8=89=B2=E4=B8=93=E5=8C=BA=E5=BC=80=E9=80=9A=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0=E5=90=8E=E8=B7=B3=E8=BD=AC403?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因：判断是否保留当前操作用户时，错误的将gitlink用户id和平台用户id做比对
---
 .../pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java
index 28660e0ae..fa34c7c0a 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java
@@ -184,7 +184,9 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService {
         if (pmsEnterpriseMapper.selectPmsEnterpriseByGitlinkOrgId(gitlinkOrgId) != null) {
             throw new ServiceException("该组织已开通组织工作台，请勿重复开通");
         }
-        boolean isContainCurrentUser = gitLinkUserToEnterpriseInputVoList.stream().anyMatch(x -> SecurityUtils.getUserId().equals(x.getUserId()));
+        boolean isContainCurrentUser = gitLinkUserToEnterpriseInputVoList
+                .stream()
+                .anyMatch(x -> SecurityUtils.getGitlinkUserId() != null && SecurityUtils.getGitlinkUserId().equals(x.getUserId()));
         if (!isContainCurrentUser) {
             throw new ServiceException("开通组织工作台需保留当前操作用户");
         }