From a58208ba19f52c8d13a0ab1a88bd62ffe8802dd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 三月 2025 17:03:45 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 3a6a73b..af618a5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -410,6 +410,7 @@
 
     @Override
     public List<HiddenDanger> findList(HiddenDanger hiddenDanger) {
+        hiddenDanger.setIsdeleted(Constants.ZERO);
         QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
         return hiddenDangerMapper.selectList(wrapper);
     }
@@ -475,8 +476,8 @@
 
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                         .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
-                .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getCreateDate,pageWrap.getModel().getQueryStartTime())
-                .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getCreateDate,pageWrap.getModel().getQueryEndTime())
+                .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime())
+                .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryEndTime())
                 .orderByDesc(Visits::getCreateDate)
         ;
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -491,6 +492,7 @@
 
     @Override
     public long count(HiddenDanger hiddenDanger) {
+        hiddenDanger.setIsdeleted(Constants.ZERO);
         QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
         return hiddenDangerMapper.selectCount(wrapper);
     }

--
Gitblit v1.9.3