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 67eab41..b3d3aeb 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 @@ -31,4 +31,24 @@ public class PowerApplyConstants { * 总监levelId值 暂定 <=0.5 */ public static final Double DIRECTOR_LEVEL = 0.5; + + /** + * 有预览和下载全部报告权限的levelId + */ + public static final Double SPECIAL_LEVEL_ONE = 1.0; + + /** + * 有预览和下载全部报告权限的levelId + */ + public static final Double SPECIAL_LEVEL_TWO = 2.0; + + /** + * 有预览和下载全部报告权限的levelId + */ + public static final Double SPECIAL_LEVEL_THREE = 3.0; + + /** + * 有预览和下载全部报告权限的levelId + */ + public static final Double SPECIAL_LEVEL_FOUL = 4.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 83229d3..c9901ec 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 @@ -461,7 +461,8 @@ public class IReportServiceImpl extends ServiceImpl //用户级别 double level = Double.parseDouble(levelId); //总监拥有全部报告的预览和下载权力 - if (level <= DIRECTOR_LEVEL) { + if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -632,7 +633,8 @@ public class IReportServiceImpl extends ServiceImpl //总监(levelId) UserEO userEo = userEODao.selectById(userId); Double levelId = Double.parseDouble(userEo.getLevelId() == null ? "1.0" : userEo.getLevelId()); - if (levelId <= DIRECTOR_LEVEL) { + if (levelId.equals(SPECIAL_LEVEL_ONE) || levelId.equals(SPECIAL_LEVEL_TWO) || + levelId.equals(SPECIAL_LEVEL_THREE) || levelId.equals(SPECIAL_LEVEL_FOUL)) { return true; } //本人