From 70a33fc291b08ccb9b05767df09c76b1fd9219e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 16:42:06 +0800
Subject: [PATCH] 最新版本

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

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9867701..c17b755 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1086,6 +1086,9 @@
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.selectAll(Member.class)
                 .selectAs(Company::getName,Member::getCompanyName) ;
+        if(StringUtils.isNotBlank(member.getName())){
+            queryWrapper.like(Member::getName,member.getName());
+        }
 
         if(null != member.getType()) {
             queryWrapper.eq(Member::getType,member.getType());
@@ -1095,11 +1098,11 @@
         }
         queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
         List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
-        if(list!=null){
-            for(Member m : list){
-                m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
-            }
-        }
+//        if(list!=null){
+//            for(Member m : list){
+//                m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
+//            }
+//        }
         return  list;
     }
     @Override

--
Gitblit v1.9.3