From fceb06eca866ffdb7e38f3346964f08d87c3d7bb Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Tue, 11 Nov 2025 19:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=85=AC=E5=8F=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SubContractorServiceImpl.java        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java
index 3cc821d2..d87df117 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java
@@ -14,7 +14,6 @@ import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.contractor.domain.SubConstructionUser;
 import org.dromara.contractor.domain.SubContractor;
 import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq;
@@ -118,16 +117,19 @@ public class SubContractorServiceImpl extends ServiceImpl<SubContractorMapper, S
         contractor.setFiles(fileMapStr);
         // 数据校验
         validEntityBeforeSave(contractor);
-        String name = req.getName();
-        Long count = this.lambdaQuery().eq(SubContractor::getName, name).count();
-        if (count > 0) {
-            throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST);
-        }
         Long projectId = req.getProjectId();
         BusProject project = projectService.getById(projectId);
         if (project == null) {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
         }
+        String name = req.getName();
+        Long count = this.lambdaQuery()
+            .eq(SubContractor::getName, name)
+            .eq(SubContractor::getProjectId, projectId)
+            .count();
+        if (count > 0) {
+            throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST);
+        }
         // 操作数据库
         boolean save = this.save(contractor);
         if (!save) {
@@ -160,7 +162,10 @@ public class SubContractorServiceImpl extends ServiceImpl<SubContractorMapper, S
         }
         // 判断名称是否重复
         if (!oldContractor.getName().equals(req.getName())) {
-            Long count = this.lambdaQuery().eq(SubContractor::getName, req.getName()).count();
+            Long count = this.lambdaQuery()
+                .eq(SubContractor::getName, req.getName())
+                .eq(SubContractor::getProjectId, req.getProjectId())
+                .count();
             if (count > 0) {
                 throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST);
             }