From 1a377cda8d5c79c37f86786c1658446fa71a4ff6 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Sun, 7 Apr 2024 19:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E4=BC=81=E4=B8=9A=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8Dbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java        | 1 +
 .../modules/worker/controller/ProjectWorkerApiController.java  | 1 +
 .../modules/worker/service/impl/DepartmentInfoServiceImpl.java | 3 ++-
 .../modules/worker/service/impl/WorkerInfoServiceImpl.java     | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java b/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java
index 7ca9e60db..bf1ecd9b8 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java
@@ -175,6 +175,7 @@ public class AsyncProjectWork {
                 teamName = teamName + "-" + enterpriseName;
                 QueryWrapper<DepartmentInfo> departmentInfoQueryWrapper = new QueryWrapper<>();
                 departmentInfoQueryWrapper.lambda().eq(DepartmentInfo::getProjectSn, workerInfo.getProjectSn())
+                        .eq(DepartmentInfo::getEnterpriseId, workerInfo.getEnterpriseId())
                         .eq(DepartmentInfo::getDepartmentName, teamName);
                 DepartmentInfo oldDepartmentInfo = departmentInfoMapper.selectOne(departmentInfoQueryWrapper);
                 if (oldDepartmentInfo != null) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
index a78634809..fa8aa7380 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
@@ -183,6 +183,7 @@ public class ProjectWorkerApiController {
             if (workerVo.getPersonType() == 2) {
                 QueryWrapper<DepartmentInfo> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().eq(DepartmentInfo::getDepartmentName, workerVo.getGroupName())
+                        .eq(DepartmentInfo::getEnterpriseId, enterpriseInfo.getId())
                         .eq(DepartmentInfo::getProjectSn, workerVo.getProjectCode());
                 DepartmentInfo departmentInfo = departmentInfoService.getOne(queryWrapper);
                 if (departmentInfo == null) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/DepartmentInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/DepartmentInfoServiceImpl.java
index e1a33bb9d..485fd5c92 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/DepartmentInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/DepartmentInfoServiceImpl.java
@@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.worker.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.async.AsyncJiLianDa;
 import com.zhgd.xmgl.async.AsyncWorker;
@@ -87,6 +86,7 @@ public class DepartmentInfoServiceImpl extends ServiceImpl<DepartmentInfoMapper,
     public DepartmentInfo saveDepartmentInfo(DepartmentInfo departmentInfo) {
         QueryWrapper<DepartmentInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(DepartmentInfo::getProjectSn, departmentInfo.getProjectSn())
+                .eq(DepartmentInfo::getEnterpriseId, departmentInfo.getEnterpriseId())
                 .eq(DepartmentInfo::getDepartmentName, departmentInfo.getDepartmentName());
         int count = departmentInfoMapper.selectCount(queryWrapper);
         if (count > 0) {
@@ -107,6 +107,7 @@ public class DepartmentInfoServiceImpl extends ServiceImpl<DepartmentInfoMapper,
         QueryWrapper<DepartmentInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(DepartmentInfo::getProjectSn, departmentInfo.getProjectSn())
                 .eq(DepartmentInfo::getDepartmentName, departmentInfo.getDepartmentName())
+                .eq(DepartmentInfo::getEnterpriseId, departmentInfo.getEnterpriseId())
                 .ne(DepartmentInfo::getId, departmentInfo.getId());
         int count = departmentInfoMapper.selectCount(queryWrapper);
         if (count > 0) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 1fd40a295..991ffd52f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -1408,6 +1408,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         if (personType == 2) {
             QueryWrapper<DepartmentInfo> departmentInfoQueryWrapper = new QueryWrapper<>();
             departmentInfoQueryWrapper.lambda().eq(DepartmentInfo::getProjectSn, workerInfo.getProjectSn())
+                    .eq(DepartmentInfo::getEnterpriseId, workerInfo.getEnterpriseId())
                     .eq(DepartmentInfo::getDepartmentName, MapUtils.getString(info, "teamName"));
             DepartmentInfo oldDepartmentInfo = departmentInfoMapper.selectOne(departmentInfoQueryWrapper);
             if (oldDepartmentInfo != null) {