From 503a82e92a5a7ebc7303b3792a44b441e5d1ca97 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 4 Jun 2024 15:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=AE=E6=B5=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B8=A6=E6=9D=A5=E7=9A=84=E5=85=B6=E4=BB=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/survey/impl/SurveyTestServiceImpl.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
index 117e6c081..062a4b0cf 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
@@ -93,7 +93,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                     DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())));
             //根据工程名称模糊搜索
-            if (StrUtil.isNotBlank(surveyTestQueryParam.getSearchValue())) {
+            if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
                 LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 surveyPlanLambdaQueryWrapper.eq(SurveyPlan::getState, DataStateEnum.ENABLE.getCode())
                         .like(SurveyPlan::getPlanName, surveyTestQueryParam.getSearchValue());
@@ -101,10 +101,10 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                 if (CollectionUtil.isNotEmpty(surveyPlans)) {
                     List<String> planIds = surveyPlans.stream().map(SurveyPlan::getId).collect(Collectors.toList());
                     surveyTestVOQueryWrapper.in("supervision_survey_test.plan_id", planIds);
+                }else {
+                    //没有匹配的。直接返回
+                    return new Page<>();
                 }
-            } else {
-                //没有匹配的。直接返回
-                return new Page<>();
             }
         }
         //获取当前用户部门所有同事的id，查看该部门下所有的数据