From e1c870f744821d2ccb822379c2a12fa354d972f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 14:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 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 051b031..470513d 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);
@@ -414,13 +435,14 @@
if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
+ if(!Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
}
if(Objects.isNull(qwIdBaseResponse.getData())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
String qwId = qwIdBaseResponse.getData();
+// String qwId = dto.getCode();
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
if(Objects.isNull(member)){
//鏍规嵁浼佷笟寰俊ID 鏌ヨ鐢ㄦ埛淇℃伅
@@ -428,7 +450,7 @@
if(Objects.isNull(qywxUserInfoResponse)||Objects.isNull(qywxUserInfoResponse.getErrcode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鑾峰彇鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if(Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
+ if(!Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+qwIdBaseResponse.getErrmsg());
}
member = new Member();
--
Gitblit v1.9.3