From e0edecb48cbf4853937976242f041b74203b8e50 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 17 三月 2024 21:18:38 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cc32054..4ac301f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -393,12 +393,22 @@
 
     @Override
     public List<Member> findList(Member member) {
-        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+
+        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+        queryWrapper.selectAll(Member.class)
+                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+                .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
+
         if(null != member.getType()) {
-            wrapper.lambda().eq(Member::getType,member.getType());
+            queryWrapper.eq(Member::getType,member.getType());
         }
-        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
-        return memberMapper.selectList(wrapper);
+        if(null != member.getCompanyId()) {
+            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+        }
+        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+
+        return memberJoinMapper.selectJoinList(Member.class,queryWrapper);
     }
 
     @Override

--
Gitblit v1.9.3