From e8fcba719ff4e32e570ec409031c29a115d0b767 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 5 Jul 2024 10:42:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SafetyCenterSubitemService.java           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
index 03c1cb15..6cbfbaad 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
@@ -123,10 +123,17 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
         }
 
         //判重，公司是否重复
-        String companyId = safetyCenterSubitem.getCompanyId();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId;
+        //如果是企业用户，使用自己的公司id
+        if (sysUser.getIsCompanyUser()) {
+            companyId = sysUser.getCompanyId();
+            safetyCenterSubitem.setCompanyId(companyId);
+        }else {
+            companyId = safetyCenterSubitem.getCompanyId();
+        }
         PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId);
         String companyName = companyManagement.getCompanyName();
-
         LambdaQueryWrapper<SafetyCenterSubitem> wrapper = new LambdaQueryWrapper<>();
         wrapper.ne(SafetyCenterSubitem::getId,subitemId);
         wrapper.eq(SafetyCenterSubitem::getProjectId,projectId);