From 67dfeea84fcf92e11e07eaf2eb0e235387287813 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 18 三月 2024 11:41:02 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 4ac301f..4d94b81 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
@@ -190,9 +190,7 @@
         if(!member.getType().equals(Constants.memberType.internal)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
         }
-        memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
-
-
+        List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
 
     }
 
@@ -393,7 +391,6 @@
 
     @Override
     public List<Member> findList(Member member) {
-
         MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.selectAll(Member.class)
@@ -408,7 +405,13 @@
         }
         queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
 
-        return memberJoinMapper.selectJoinList(Member.class,queryWrapper);
+        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(),""));
+            }
+        }
+        return  list;
     }
 
     @Override

--
Gitblit v1.9.3