From f8c827392607967121c5f9a57894645f18ad5953 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 15 四月 2025 18:14:13 +0800 Subject: [PATCH] 代码初始化 --- server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 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 d0dea26..b204cea 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 @@ -14,6 +14,7 @@ import com.doumee.dao.business.CompanyMapper; import com.doumee.dao.business.CompanyMemberMapper; import com.doumee.dao.business.MemberMapper; +import com.doumee.dao.business.model.Category; import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.CompanyMember; import com.doumee.dao.business.model.Member; @@ -84,7 +85,19 @@ @Override public void updateById(Member member) { - memberMapper.updateById(member); + if( member.getId() == null){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + memberMapper.update(null,new UpdateWrapper<Member>().lambda() + .eq(Member::getId,member.getId() ) + .set(Member::getSex,member.getSex() ) + .set(Member::getPhone,member.getPhone() ) + .set(Member::getRemark,member.getRemark() ) + .set(Member::getEmail,member.getEmail() ) + .set(Member::getEditDate,new Date()) + .set(Member::getEditor,user.getId()) + ); } @Override @@ -208,7 +221,15 @@ 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)); + PageData<Member> record = PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper)); + if(record!=null && record.getRecords()!=null){ + for(Member m : record.getRecords()){ + if(StringUtils.isNotBlank(m.getCompanyName())){ + m.setCompanyNameList(m.getCompanyName().split(",")); + } + } + } + return record; } @Override @@ -278,7 +299,7 @@ if(StringUtils.isNotBlank(comNames)){ comNames += ","; } - comNames += c.getName(); + comNames += c.getNamePath(); } } cm.setCompanyList(qycom); -- Gitblit v1.9.3