From 3ae2f5b6fb34c4718040229ef82cfdf2414304fc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 07 四月 2025 11:43:29 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 306647d..b35e7e0 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -109,9 +109,53 @@
}
@Override
- public List<Member> findList(Member member) {
- QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
- return memberMapper.selectList(wrapper);
+ public List<Member> findList(Member pageWrap) {
+ pageWrap.setIsdeleted(Constants.ZERO);
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper. selectAll(Member.class)
+ .selectAs(SystemUser::getUsername,Member::getEditorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor)
+ .eq(pageWrap.getId() != null, Member::getId, pageWrap.getId())
+ .eq(pageWrap.getCreator() != null, Member::getCreator, pageWrap.getCreator())
+ .ge(pageWrap.getCreateDate() != null, Member::getCreateDate, Utils.Date.getStart(pageWrap.getCreateDate()))
+ .le(pageWrap.getCreateDate() != null, Member::getCreateDate, Utils.Date.getEnd(pageWrap.getCreateDate()))
+ .eq(pageWrap.getEditor() != null, Member::getEditor, pageWrap.getEditor())
+ .ge(pageWrap.getEditDate() != null, Member::getEditDate, Utils.Date.getStart(pageWrap.getEditDate()))
+ .le(pageWrap.getEditDate() != null, Member::getEditDate, Utils.Date.getEnd(pageWrap.getEditDate()))
+ .eq(pageWrap.getIsdeleted() != null, Member::getIsdeleted, pageWrap.getIsdeleted())
+ .like(pageWrap.getName() != null, Member::getName, pageWrap.getName())
+ .eq(pageWrap.getRemark() != null, Member::getRemark, pageWrap.getRemark())
+ .eq(pageWrap.getStatus() != null, Member::getStatus, pageWrap.getStatus())
+ .eq(pageWrap.getSortnum() != null, Member::getSortnum, pageWrap.getSortnum())
+ .eq(pageWrap.getImgurl() != null, Member::getImgurl, pageWrap.getImgurl())
+ .eq(pageWrap.getType() != null, Member::getType, pageWrap.getType())
+ .eq(pageWrap.getCompanyName() != null, Member::getCompanyName, pageWrap.getCompanyName())
+ .eq(pageWrap.getPhone() != null, Member::getPhone, pageWrap.getPhone())
+ .eq(pageWrap.getEmail() != null, Member::getEmail, pageWrap.getEmail())
+ .eq(pageWrap.getSex() != null, Member::getSex, pageWrap.getSex())
+ .eq(pageWrap.getCode() != null, Member::getCode, pageWrap.getCode())
+ .eq(pageWrap.getQwId() != null, Member::getQwId, pageWrap.getQwId())
+ .eq(pageWrap.getIdcard() != null, Member::getIdcard, pageWrap.getIdcard())
+ .ge(pageWrap.getLastLoginDate() != null, Member::getLastLoginDate, Utils.Date.getStart(pageWrap.getLastLoginDate()))
+ .le(pageWrap.getLastLoginDate() != null, Member::getLastLoginDate, Utils.Date.getEnd(pageWrap.getLastLoginDate()))
+ .eq(pageWrap.getLoginCount() != null, Member::getLoginCount, pageWrap.getLoginCount());
+ if (pageWrap.getKeyword() != null) {
+ queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getKeyword())
+ .or().like(Member::getPhone,pageWrap.getKeyword())
+ .or().like(Member::getCompanyName,pageWrap.getKeyword()));
+ }
+ if(pageWrap.getIncludeChild()!=null &&pageWrap.getIncludeChild() ){
+ if(pageWrap.getCompanyId() !=null){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Company company = companyMapper.selectById(pageWrap.getCompanyId());//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.exists("select (cm.id) from company_member cm where cm.company_id_path like '"+company.getIdPath()+"%' and cm.member_id=t.id");
+// queryWrapper.likeRight(Company::getIdPath,company.getIdPath());
+ }
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.exists(pageWrap.getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getCompanyId()+"' and cm.member_id=t.id");
+ }
+ return memberMapper.selectJoinList(Member.class,queryWrapper);
}
@Override
@@ -137,7 +181,7 @@
.eq(pageWrap.getModel().getSortnum() != null, Member::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getImgurl() != null, Member::getImgurl, pageWrap.getModel().getImgurl())
.eq(pageWrap.getModel().getType() != null, Member::getType, pageWrap.getModel().getType())
-// .eq(pageWrap.getModel().getCompanyId() != null, Member::getCompanyId, pageWrap.getModel().getCompanyId())
+ .eq(pageWrap.getModel().getCompanyName() != null, Member::getCompanyName, pageWrap.getModel().getCompanyName())
.eq(pageWrap.getModel().getPhone() != null, Member::getPhone, pageWrap.getModel().getPhone())
.eq(pageWrap.getModel().getEmail() != null, Member::getEmail, pageWrap.getModel().getEmail())
.eq(pageWrap.getModel().getSex() != null, Member::getSex, pageWrap.getModel().getSex())
@@ -161,7 +205,7 @@
}
}else{
//涓嶅寘鍚笅绾х粍缁�
- queryWrapper.exists("select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"' and cm.member_id=t.id");
+ queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"' and cm.member_id=t.id");
}
queryWrapper.orderByAsc(Member::getCreateDate);
return PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
--
Gitblit v1.9.3