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 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 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 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 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 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) {