From 43db8d016dc5079da163c02a6e7d63185c78b3af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码初始化

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

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index ee08189..99d30ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛⊿ervice瀹炵幇
@@ -228,8 +229,12 @@
     }
     @Override
     public   List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) {
-        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(pageWrap);
-        pageWrap.setIsdeleted(Constants.ZERO);
+        HiddenDangerParam hiddenDangerParam = new HiddenDangerParam();
+        hiddenDangerParam.setIsdeleted(Constants.ZERO);
+        if(Objects.nonNull(pageWrap.getId())){
+            hiddenDangerParam.setId(pageWrap.getId());
+        }
+        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
         List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper);
         List<Member> memberList = new ArrayList<>();
         if(list!=null){
@@ -252,6 +257,7 @@
                         .leftJoin(Company.class, Company::getId,Member::getCompanyId)
                         .eq(Member::getType,Constants.TWO)
                         .eq(Member::getIsdeleted,Constants.ZERO)
+                        .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName())
                         .in(Member::getId,idList)
                 );
             }

--
Gitblit v1.9.3