From 4063bb9fda830cf2f1ecdb0bd2b13657ef268530 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 15:51:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=A2=84=E8=A7=88=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=ADEmployeeT?= =?UTF-8?q?ypeID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/constant/PowerApplyConstants.java | 5 +++++ .../report/service/impl/IReportServiceImpl.java | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java index b3d3aeb..70f24be 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java +++ b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java @@ -51,4 +51,9 @@ public class PowerApplyConstants { * 有预览和下载全部报告权限的levelId */ public static final Double SPECIAL_LEVEL_FOUL = 4.0; + + /** + * 有预览和下载全部报告权限的Employee_TYPE_ID + */ + public static final Double EMPLOYEE_TYPE_ID_ONE = 1.0; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 22b6f55..e54a37a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -458,11 +458,14 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); //用户级别 double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) { + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -632,9 +635,15 @@ public class IReportServiceImpl extends ServiceImpl //校验权限 //总监(levelId) UserEO userEo = userEODao.selectById(userId); - Double levelId = Double.parseDouble(userEo.getLevelId() == null ? "1.0" : userEo.getLevelId()); - if (levelId.equals(SPECIAL_LEVEL_ONE) || levelId.equals(SPECIAL_LEVEL_TWO) || - levelId.equals(SPECIAL_LEVEL_THREE) || levelId.equals(SPECIAL_LEVEL_FOUL)) { + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); + //用户级别 + double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); + //总监拥有全部报告的预览和下载权力 + if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { return true; } //本人