12chenyi

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -9,7 +9,6 @@ import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.*;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.common.utils.SecurityUtils.SecurityUtils;
-import cn.cslg.report.common.utils.auth.checkAuth;
 import cn.cslg.report.entity.*;
 
 import cn.cslg.report.entity.asso.AssoReportFile;
@@ -21,22 +20,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -262,11 +256,11 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             if (reports.size() > 0) {
                 reports = this.reportData(reports);
             }
-
             SecurityUtils.startDataScope("/pcs/report/query");
             Long count = this.count(queryWrapper);
             return Response.success(reports, DataUtils.setPageColumn(reportVO.getSize(), reportVO.getCurrent(), Math.toIntExact(count)));
-        } else {
+        }
+        else {
             SecurityUtils.startDataScope("/pcs/report/query");
             List<Report> reports = this.list(queryWrapper);
             SecurityUtils.startDataScope("/pcs/report/query");