From 6f0d96de85f9782b4063c050d62de0978a82b80b Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 18 May 2024 16:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E7=9A=84=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/service/IUserEnterpriseService.java | 6 +++++- .../impl/XzBlindPlatePlugSafeServiceImpl.java | 14 +++++++++++--- .../service/impl/XzGroundSafetServiceImpl.java | 9 +++++++++ .../service/impl/XzHighJobSafeServiceImpl.java | 9 +++++++++ .../service/impl/XzHoistSafetyWorkServiceImpl.java | 10 ++++++++++ .../service/impl/XzLimitSpaceSafeServiceImpl.java | 9 +++++++++ .../service/impl/XzOpenCircuitSafeServiceImpl.java | 9 +++++++++ .../XzSpecialOperationFireSafetyServiceImpl.java | 9 +++++++++ .../XzTemporaryElectricitySafeServiceImpl.java | 8 ++++++++ 9 files changed, 79 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IUserEnterpriseService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IUserEnterpriseService.java index f8c5b194b..cb697d57a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IUserEnterpriseService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IUserEnterpriseService.java @@ -17,7 +17,11 @@ public interface IUserEnterpriseService extends IService { UserEnterprise selectUserEnterpriseByUserId(Long userId); - + /** + * 项目子账号查询所有的企业列表id + * + * @return + */ List getEnterpriseIdsIfSubProject(); void addEnterpriseIdForSubProject(String enterpriseId); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java index 40c093b07..ed46c9557 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,14 +7,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe; import com.zhgd.xmgl.modules.xz.special.mapper.XzBlindPlatePlugSafeMapper; -import com.zhgd.xmgl.modules.xz.special.service.IXzBlindPlatePlugSafeService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.modules.xz.special.service.IXzBlindPlatePlugSafeService; +import com.zhgd.xmgl.security.entity.UserInfo; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +33,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl implements IXzBlindPlatePlugSafeService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzBlindPlatePlugSafeMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +58,11 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzBlindPlatePlugSafe.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzBlindPlatePlugSafe::getCreateDate)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java index 1dc5abc4c..78ab6948e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGroundSafetMapper; import com.zhgd.xmgl.modules.xz.special.entity.XzGroundSafet; import com.zhgd.xmgl.modules.xz.special.service.IXzGroundSafetService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -32,6 +34,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzGroundSafetServiceImpl extends ServiceImpl implements IXzGroundSafetService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzGroundSafetMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +59,11 @@ public class XzGroundSafetServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzGroundSafet.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzGroundSafet::getCreateDate)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java index 53bd09de1..72f5b2c39 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzHighJobSafe; import com.zhgd.xmgl.modules.xz.special.mapper.XzHighJobSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzHighJobSafeService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -32,6 +34,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzHighJobSafeServiceImpl extends ServiceImpl implements IXzHighJobSafeService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzHighJobSafeMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +59,11 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzHighJobSafe.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHighJobSafe::getCreateDate)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java index 93990034a..450546571 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java @@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzHoistSafetyWork; import com.zhgd.xmgl.modules.xz.special.mapper.XzHoistSafetyWorkMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzHoistSafetyWorkService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.security.entity.UserInfo; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -32,6 +35,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzHoistSafetyWorkServiceImpl extends ServiceImpl implements IXzHoistSafetyWorkService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzHoistSafetyWorkMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +60,11 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzHoistSafetyWork.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHoistSafetyWork::getCreateDate)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java index b002c155d..e0a6d941d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzLimitSpaceSafe; import com.zhgd.xmgl.modules.xz.special.mapper.XzLimitSpaceSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzLimitSpaceSafeService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -32,6 +34,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzLimitSpaceSafeServiceImpl extends ServiceImpl implements IXzLimitSpaceSafeService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzLimitSpaceSafeMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +59,11 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzLimitSpaceSafe.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzLimitSpaceSafe::getCreateDate)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java index a9a04dcb8..1fd41ff54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzOpenCircuitSafe; import com.zhgd.xmgl.modules.xz.special.mapper.XzOpenCircuitSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzOpenCircuitSafeService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -32,6 +34,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzOpenCircuitSafeServiceImpl extends ServiceImpl implements IXzOpenCircuitSafeService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzOpenCircuitSafeMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +59,11 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzOpenCircuitSafe.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzOpenCircuitSafe::getCreateDate)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java index 064d70d8d..9f31abd36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java @@ -10,12 +10,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; import com.zhgd.xmgl.modules.xz.special.entity.XzSpecialOperationFireSafety; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzSpecialOperationFireSafetyMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzGasAnalyzeService; import com.zhgd.xmgl.modules.xz.special.service.IXzSpecialOperationFireSafetyService; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; @@ -36,6 +38,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl implements IXzSpecialOperationFireSafetyService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzSpecialOperationFireSafetyMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -59,6 +63,11 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzSpecialOperationFireSafety.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSpecialOperationFireSafety::getCreateDate)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java index 92423a925..e2776c60e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.xz.special.entity.XzTemporaryElectricitySafe; import com.zhgd.xmgl.modules.xz.special.mapper.XzTemporaryElectricitySafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzTemporaryElectricitySafeService; @@ -32,6 +33,8 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl implements IXzTemporaryElectricitySafeService { + @Autowired + IUserEnterpriseService userEnterpriseService; @Autowired private XzTemporaryElectricitySafeMapper xzSpecialOperationFireSafetyMapper; @Autowired @@ -55,6 +58,11 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTemporaryElectricitySafe.class, paramMap, alias); + UserInfo user = SecurityUtils.getUser(); + if (user.getAccountType() == 6) { + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + queryWrapper.and(w -> w.in(alias + "operating_unit", enterpriseIds).or().in(alias + "job_application_unit", enterpriseIds)); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTemporaryElectricitySafe::getCreateDate)); return queryWrapper;