From 5d643fbc6af194445938336d35688fb1c61e3a2e Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Sat, 30 Aug 2025 03:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/BusProjectTeamMemberServiceImpl.java  | 3 +++
 .../project/service/impl/BusProjectTeamServiceImpl.java        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index bcb22025..d61c1a6b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -290,6 +290,9 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         SysUserVo userVo = userService.selectUserById(memberId);
         if (userVo != null) {
             projectTeamMemberVo.setMemberName(userVo.getNickName());
+        } else {
+            SubConstructionUser user = constructionUserService.getBySysUserId(memberId);
+            projectTeamMemberVo.setMemberName(user.getUserName());
         }
         return projectTeamMemberVo;
     }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
index 37313691..f852e621 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
@@ -191,6 +191,9 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         String teamName = entity.getTeamName();
         LambdaQueryWrapper<BusProjectTeam> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BusProjectTeam::getTeamName, teamName);
+        if (entity.getId() != null) {
+            queryWrapper.ne(BusProjectTeam::getId, entity.getId());
+        }
         long count = this.count(queryWrapper);
         if (count > 0) {
             throw new ServiceException("项目组名重复", HttpStatus.BAD_REQUEST);