From bd605ac1e79b73db3b501f323d6f4a10c0f27dd5 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期五, 27 六月 2025 15:01:57 +0800 Subject: [PATCH] 部分功能调整 --- multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java index 425c716..acf7d43 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java @@ -226,7 +226,7 @@ @Override public void checkDeptDataScope(Long deptId) { - if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ObjectUtil.isNotNull(deptId)) + if (!SecurityUtils.adminUser() && ObjectUtil.isNotNull(deptId)) { SysDept dept = new SysDept(); dept.setDeptId(deptId); @@ -260,13 +260,12 @@ @Override @Transactional public int saveDept(SysDeptSaveDTOReq dept) { - Long companyId = SecurityUtils.getCompanyId(); - if (!companyId.equals(dept.getCompanyId())){ - throw new ApiException("无权操作!"); - } +// Long companyId = SecurityUtils.getCompanyId(); +// if (!companyId.equals(dept.getCompanyId())){ +// throw new ApiException("无权操作!"); +// } SysDept sysDept = new SysDept(); BeanUtils.copyProperties(dept, sysDept); - sysDept.setCompanyId(companyId); boolean b = checkDeptNameUnique(sysDept); if (!b){ throw new ApiException("部门名称已存在!"); @@ -287,7 +286,7 @@ delCaluse(sysDept.getDeptId(), delCaluseIds); } //处理条款 - batchSaveCaluse(sysDept.getDeptId(), companyId, dept.getCaluseVO1List()); + batchSaveCaluse(sysDept.getDeptId(), dept.getCompanyId(), dept.getCaluseVO1List()); } @@ -297,15 +296,15 @@ @Override @Transactional public int saveDeptResponsibility(SysDeptResponsibilityReqVo reqVo) { - Long companyId = SecurityUtils.getCompanyId(); - if (!companyId.equals(reqVo.getCompanyId())){ - throw new ApiException("无权操作!"); - } +// Long companyId = SecurityUtils.getCompanyId(); +// if (!companyId.equals(reqVo.getCompanyId())){ +// throw new ApiException("无权操作!"); +// } SysDept sysDept = deptMapper.selectDeptById(reqVo.getDeptId()); if (null == sysDept){ throw new ApiException("部门不存在!"); } - if (!companyId.equals(sysDept.getCompanyId())){ + if (!reqVo.getCompanyId().equals(sysDept.getCompanyId())){ throw new ApiException("无权操作!"); } SysDept dept = new SysDept(); @@ -336,9 +335,9 @@ @Transactional public int initFunctionalDistribution(Long companyId) { - if (!companyId.equals(SecurityUtils.getCompanyId())){ - throw new ApiException("无权操作!"); - } +// if (!companyId.equals(SecurityUtils.getCompanyId())){ +// throw new ApiException("无权操作!"); +// } sysFunctionalDistributionMapper.delByCompanyId(companyId); SysDept sysDept = new SysDept(); @@ -370,15 +369,15 @@ @Override public int saveFunctionalDistribution(FunctionalDistributionVo reqVo) { - Long companyId = SecurityUtils.getCompanyId(); - if (!companyId.equals(reqVo.getCompanyId())){ - throw new ApiException("无权操作!"); - } +// Long companyId = SecurityUtils.getCompanyId(); +// if (!companyId.equals(reqVo.getCompanyId())){ +// throw new ApiException("无权操作!"); +// } List<SysFunctionalDistribution> list = reqVo.getList(); if (list != null && !list.isEmpty()) { for (SysFunctionalDistribution sysFunctionalDistribution : list) { - sysFunctionalDistribution.setCompanyId(companyId); + sysFunctionalDistribution.setCompanyId(reqVo.getCompanyId()); sysFunctionalDistribution.setUpdateBy(SecurityUtils.getUsername()); sysFunctionalDistribution.setUpdateTime(LocalDateTime.now()); } -- Gitblit v1.9.2