From ca022b3384fe521260311cd5f1ba124232f3748e Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Thu, 19 Mar 2026 11:45:42 +0800 Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E5=85=BC=E5=AE=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E5=92=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=98=AF?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E4=BA=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/service/impl/DemandServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 7a7b96c0..d8eeeb2c 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -314,7 +314,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService { userPermissions.put(userId, FilePermissionEnum.ALL.getValue()); // 仿真负责人 if (CollectionUtils.isNotEmpty(allMemberList)) { - allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).forEach(member -> { + // 兼容创建人和负责人是同一个人的情况 + allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && !Objects.equals(userId, member.getUserId())).forEach(member -> { userPermissions.put(member.getUserId(), FilePermissionEnum.BASE.getValue()); }); } @@ -1790,7 +1791,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService { userPermissions.put(userId, FilePermissionEnum.ALL.getValue()); // 仿真负责人 if (CollectionUtils.isNotEmpty(allMemberList)) { - allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).forEach(member -> { + // 兼容创建人和负责人是同一个人的情况 + allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && !Objects.equals(userId, member.getUserId())).forEach(member -> { userPermissions.put(member.getUserId(), FilePermissionEnum.BASE.getValue()); }); }