From 32b4f6188f32e6c08e813efa98a25d94eacdc0c6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 四月 2024 09:32:29 +0800
Subject: [PATCH] Revert "新考核"

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 7e759e5..91a7e7c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -24,6 +24,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -112,6 +113,7 @@
     public Result page(ReportQuery query) {
 
         IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                 .orderByDesc(Report::getCreateTime)
                 .page(PageUtil.getPage(query, Report.class));
 

--
Gitblit v1.8.0