From c3453a34d87881e4884c0eaa44f7d9824833991a Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 10:48:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DBug=E3=80=9069319?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 报告管理--编辑页面没有回显保密日期 --- .../com/adc/da/report/service/impl/IReportServiceImpl.java | 4 ++-- .../src/main/java/com/adc/da/report/vo/ReportDetailVo.java | 6 ++++++ .../resources/mybatis/mapper/mysql/ReportManageMapper.xml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) 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 c9901ec..22b6f55 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 @@ -457,7 +457,7 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); - String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId(); + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); //用户级别 double level = Double.parseDouble(levelId); //总监拥有全部报告的预览和下载权力 @@ -717,7 +717,7 @@ public class IReportServiceImpl extends ServiceImpl }); } UserEO userEo = userEODao.selectById(UserUtils.getUserId()); - String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId(); + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); //用户级别 double level = Double.parseDouble(levelId); if (level <= 0.5) { diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java index 69e6851..5843c73 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -105,4 +106,9 @@ public class ReportDetailVo { * 标签列表名 */ private List labels; + + /** + * 保密到期日期 + */ + private Date secrecyLast; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 05095f3..4bf88c4 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -286,7 +286,8 @@ rm.fileId AS fileId, f.file_name as fileName, rm.confidentialLevel AS confidentialLevel, - rm.privacyLevel AS privacyLevel + rm.privacyLevel AS privacyLevel, + rm.secrecy_last AS secrecyLast FROM `tt_report_manage` AS rm LEFT JOIN ts_user AS u ON u.USID = rm.createUserId LEFT JOIN ts_org as org on org.id = rm.department