From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6dc569d..1cb8140 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -183,8 +183,19 @@
}
@Override
+ public User userByPhone(String tenantId, String phone) {
+ return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getPhone, phone).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
+ }
+
+ @Override
public UserInfo userInfo(Long userId) {
User user = baseMapper.selectById(userId);
+ return buildUserInfo(user);
+ }
+
+ @Override
+ public UserInfo userInfo(String tenantId, String phone) {
+ User user = userByPhone(tenantId, phone);
return buildUserInfo(user);
}
@@ -312,6 +323,10 @@
user.setPostId(Func.toStrWithEmpty(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()), StringPool.EMPTY));
// 设置角色ID
user.setRoleId(Func.toStrWithEmpty(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()), StringPool.EMPTY));
+ // 设置员工类型
+ user.setEmployeeType(Func.toInt(DictCache.getKey(DictEnum.EMPLOYEE_TYPE, userExcel.getEmployeeType()), 1));
+ // 设置学历
+ user.setEducationBackground(Func.toStr(DictCache.getKey(DictEnum.EDUCATION_BACKGROUND, userExcel.getEducationBackground()), "1"));
// 设置租户ID
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
--
Gitblit v1.9.3