From 62db637bdd59baf0c54f540dd11a9bab7af107ad Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 5 Dec 2024 14:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/leaflet/impl/WarningLeafletServiceImpl.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
index 3717a7a4d..0f5e94de0 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -129,7 +129,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     @Override
     public Page<WarningLeafletVO> warningPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) {
         QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper = new QueryWrapper<>();
-        if (Objects.nonNull(warningLeafletQueryParam) && StringUtils.equals(warningLeafletQueryParam.getDealState(), "1")) {
+        if (Objects.nonNull(warningLeafletQueryParam)) {
             //添加上时间范围
             warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
@@ -142,7 +142,6 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
             warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.dept_id", deptIds);
         }
         warningLeafletVOQueryWrapper
-                .eq(StringUtils.equals(warningLeafletQueryParam.getDealState(), "0"), "supervision_temp_line_run_test_warning.deal_state", 0)
                 .eq("supervision_warning_leaflet.state", DataStateEnum.ENABLE.getCode())
                 .eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.WARNING.getCode())
                 .orderByDesc("supervision_warning_leaflet.Update_Time");