fix:修复未删除的老权限,替换为公用鉴权方法
This commit is contained in:
@@ -27,11 +27,6 @@ public class PowerApplyConstants {
|
||||
*/
|
||||
public static final Integer DOWNLOAD = 3;
|
||||
|
||||
/**
|
||||
* 总监levelId值 暂定 <=0.5
|
||||
*/
|
||||
public static final Double DIRECTOR_LEVEL = 0.5;
|
||||
|
||||
/**
|
||||
* 有预览和下载全部报告权限的levelId
|
||||
*/
|
||||
|
||||
@@ -710,34 +710,13 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
|
||||
List<String> labels = labelEntities.stream().map(TreeLabelEntity::getLabel).collect(Collectors.toList());
|
||||
reportDetailVo.setLabels(labels);
|
||||
}
|
||||
//设置当前用户受否有下载权限
|
||||
if (UserUtils.getUserId().equals(reportDetailVo.getCreateUserId())) {
|
||||
//判断当前用户有没有下载权限
|
||||
if (isAllowDownload(UserUtils.getUserId(),reportId)) {
|
||||
reportDetailVo.setDownPower(1);
|
||||
} else {
|
||||
reportDetailVo.setDownPower(0);
|
||||
//查看申请权限表的权限
|
||||
List<Integer> powerList = new ArrayList<>();
|
||||
powerList.add(PREVIEW_DOWNLOAD);
|
||||
powerList.add(DOWNLOAD);
|
||||
LambdaQueryWrapper<PowerApply> powerApplyLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
powerApplyLambdaQueryWrapper.in(PowerApply::getPower, powerList);
|
||||
powerApplyLambdaQueryWrapper.eq(PowerApply::getReportId, reportId);
|
||||
List<PowerApply> list = iPowerApplyService.list(powerApplyLambdaQueryWrapper);
|
||||
if (CollectionUtils.isNotEmpty(list)) {
|
||||
list.forEach(powerApply -> {
|
||||
if (powerApply.getUserId().equals(UserUtils.getUserId())) {
|
||||
reportDetailVo.setDownPower(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
UserEO userEo = userEODao.selectById(UserUtils.getUserId());
|
||||
String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId();
|
||||
//用户级别
|
||||
double level = Double.parseDouble(levelId);
|
||||
if (level <= 0.5) {
|
||||
reportDetailVo.setDownPower(1);
|
||||
}
|
||||
}
|
||||
|
||||
//报告日志管理
|
||||
reportLog(reportDetailVo.getName(),"预览");
|
||||
return Result.success(reportDetailVo);
|
||||
|
||||
Reference in New Issue
Block a user