From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2286c40..dbd486b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -25,6 +25,8 @@
import com.doumee.dao.business.web.response.AccountResponse;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.UserResponse;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.MemberService;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
@@ -53,6 +55,8 @@
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Override
@@ -398,8 +402,28 @@
UserResponse userResponse = new UserResponse();
BeanUtils.copyProperties(member,userResponse);
userResponse.setMobile(member.getPhone());
+ if(member.getSysuserId()!=null){
+ SystemUser user= systemUserMapper.selectById(member.getSysuserId());
+ if(user !=null && !Constants.equalsInteger(user.getDeleted(),Constants.ONE)
+ && !Constants.equalsInteger(user.getStatus(),Constants.ONE)){
+ SystemUser u = new SystemUser();
+ u.setId(user.getId());
+ u.setUsername(user.getUsername());
+ u.setNickname(user.getNickname());
+ u.setRealname(user.getRealname());
+ userResponse.setSysuser(u);
+ }
+ }
return userResponse;
}
+ @Override
+ public void clearPhone(String memberId) {
+ // 閫�鍑虹櫥褰�:娓呯┖浼氬憳鎵嬫満鍙�(缃┖涓�),淇濈暀鍏朵粬淇℃伅(鍚� sysuser 缁戝畾)
+ memberMapper.update(null, new UpdateWrapper<Member>().lambda()
+ .set(Member::getPhone, StringUtils.EMPTY)
+ .eq(Member::getId, memberId));
+ }
+
}
--
Gitblit v1.9.3