From b23507a3c4f7516407b59ddeba2f4843c31b1e81 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 25 May 2023 19:26:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 8d5523a..fe6248e 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
@@ -142,7 +142,7 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -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) {
@@ -435,4 +438,30 @@
return baseMapper.customizeGetList(user);
}
+ /**
+ * 根据手机号码查询用户信息
+ * @param tenantId
+ * @param phone
+ * @return
+ */
+ @Override
+ 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);
+ }
+
+ @Override
+ public List<User> getUserByPhoneIds(String phoneIds) {
+ return baseMapper.getUserByPhoneIds(phoneIds);
+ }
}
--
Gitblit v1.9.3