Merge remote-tracking branch 'origin/lixuetao' into lixuetao

adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java

@@ -457,7 +457,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
 
         //设置权限
         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<ReportDao, ReportEntity>
                 });
             }
             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) {

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<String> labels;
+
+    /**
+     * 保密到期日期
+     */
+    private Date secrecyLast;
 }

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