From 8725ebeaadc6714823593a6b10a0dd9acdf0d14a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 17:19:34 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 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 463e277..2ba9c75 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
@@ -167,6 +167,7 @@
user.setSalt(salt);
// 鍒涘缓鐢ㄦ埛璁板綍
user.setType(insert.getType());
+ user.setAvatar(insert.getFaceImg());
user.setUsername(insert.getPhone());
user.setEmpNo(insert.getCode());
user.setRealname(insert.getName());
@@ -444,11 +445,15 @@
member.setHkOrgId(company.getHkId());
isNeedUpdateUser = true;
}
+ if(StringUtils.isNotBlank(model.getFaceImg())){
+ isNeedUpdateUser=true;
+ }
if(isNeedUpdateUser){
//鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
+ .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
.set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
.set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
.set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
@@ -1624,30 +1629,24 @@
@Override
- public MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
- Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
- if(Objects.isNull(checkVisitedDTO)||StringUtils.isBlank(checkVisitedDTO.getMobile())||(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getPhone,checkVisitedDTO.getMobile())
- .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
+ public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
-// .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
- .last(" limit 1 ")
+ .eq(Member::getType,Constants.memberType.internal)
);
- MemberVO memberVO = new MemberVO();
- if(!Objects.isNull(member)){
- if(!member.getStatus().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"琚浜鸿处鍙峰紓甯革紝璇风‘璁ゅ悗鍐嶈瘯");
+ List<MemberVO> memberVOList = new ArrayList<>();
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
+ for (Member member:memberList) {
+ MemberVO memberVO = new MemberVO();
+ BeanUtils.copyProperties(member,memberVO);
+ memberVOList.add(memberVO);
}
- BeanUtils.copyProperties(member,memberVO);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋牳瀹炶璁夸汉淇℃伅!");
}
- return memberVO;
+ return memberVOList;
}
--
Gitblit v1.9.3