From ed9c9f07d1f9a5ed027e06feb8f0f5ed2d1756bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 六月 2024 10:39:25 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 7f6b533..82ee127 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
@@ -1098,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
@@ -1112,7 +1112,7 @@
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName)
.eq(Member::getType,Constants.TWO)
- .exists("select d.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
+ .exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
--
Gitblit v1.9.3