From fa382bfdbdc4f16afc073c746f1abfae2e5a9c2e Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 23 Apr 2020 16:03:00 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=B6=85=E7=AE=A1=E6=89=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=A7=9F=E6=88=B7=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/service/impl/UserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index e4bc4158..9c971465 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -24,6 +24,7 @@ import lombok.AllArgsConstructor; import org.springblade.common.constant.CommonConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; @@ -193,6 +194,10 @@ public class UserServiceImpl extends BaseServiceImpl implement user.setPostId(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName())); // 设置角色ID user.setRoleId(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName())); + // 设置租户ID + if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) { + user.setTenantId(AuthUtil.getTenantId()); + } // 覆盖数据 if (isCovered) { // 查询用户是否存在