From 1690e3e4c0d9583c3fdc3b2a1f91626dc980aff2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 25 Apr 2023 11:50:45 +0800
Subject: [PATCH] 新增根据account获取phone查询用户信息，取第一个，登录用户信息查询修改，短信发送响应数据修改
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
index 4d3de6c..195ad04 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
@@ -198,8 +198,11 @@
@Override
public UserInfo userInfo(String tenantId, String account, UserEnum userEnum) {
- User user = baseMapper.getUser(tenantId, account);
- return buildUserInfo(user, userEnum);
+ List<User> list = baseMapper.selectUserByPhoneOrAccount(tenantId, account);
+ if (list.size()>0){
+ return buildUserInfo(list.get(0), userEnum);
+ }
+ return buildUserInfo(null, userEnum);
}
private UserInfo buildUserInfo(User user) {
@@ -445,4 +448,15 @@
public List<User> userInfoByPhone(String tenantId, String phone) {
return list(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getPhone, phone).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
}
+
+ /**
+ * 根据手机号码或者账户查询用户信息
+ * @param tenantId 租户id
+ * @param key 账户或者手机号
+ * @return
+ */
+ @Override
+ public List<User> userInfoByPhoneOrAccount(String tenantId, String key) {
+ return baseMapper.selectUserByPhoneOrAccount(tenantId,key);
+ }
}
--
Gitblit v1.9.3