From 14f230da5da399baf31718b5cdaed765fa1ad5e9 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 18:07:35 +0800
Subject: [PATCH] 用户客户端设置
---
blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 4145b2f..54616dd 100644
--- a/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -22,6 +22,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.auth.utils.AuthUtils;
+import org.springblade.common.cache.DictCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -29,19 +32,15 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.BladeTenantProperties;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
-import org.springblade.system.cache.DictCache;
-import org.springblade.system.cache.ParamCache;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Tenant;
import org.springblade.system.enums.DictEnum;
-import org.springblade.system.feign.ISysClient;
import org.springblade.system.service.IRoleService;
-import org.springblade.system.service.ITenantService;
import org.springblade.system.user.cache.UserCache;
import org.springblade.system.user.entity.*;
import org.springblade.system.user.enums.UserEnum;
@@ -145,6 +144,10 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ String clientIds = AuthUtils.getClientIds();
+ if (Strings.isBlank(user.getClientIds()) && !clientIds.equals("sys")){
+ user.setClientIds(AuthUtils.getClientIds());
+ }
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -311,7 +314,7 @@
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置用户平台
- user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1));
+ user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE.getName(), userExcel.getUserTypeName()), 1));
// 设置部门ID
user.setDeptId(Func.toStrWithEmpty(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName()), StringPool.EMPTY));
// 设置岗位ID
@@ -343,7 +346,7 @@
public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
userList.forEach(user -> {
- user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
+ user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE.getName(), user.getUserType()));
user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
--
Gitblit v1.9.3