From 481df647b02730b700945f9582602fcc6913c38f Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 28 Aug 2025 17:53:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/service/userdept/UserDeptServiceImpl.java | 5 +++-- .../module/system/service/sync/UserSyncServiceImplTest.java | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/userdept/UserDeptServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/userdept/UserDeptServiceImpl.java index d9beddf5..b181f284 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/userdept/UserDeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/userdept/UserDeptServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.userdept; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.system.dal.dataobject.userdept.UserDeptDO; import cn.iocoder.yudao.module.system.dal.mysql.userdept.UserDeptMapper; import jakarta.annotation.Resource; @@ -11,7 +12,7 @@ import org.springframework.validation.annotation.Validated; import java.util.Collection; import java.util.List; -import java.util.Objects; +import java.util.Optional; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; @@ -107,7 +108,7 @@ public class UserDeptServiceImpl implements UserDeptService { } List list = BeanUtils.toBean(createReqVOList, UserDeptDO.class); // 默认使用当前用户的租户 - Long tenantId = Objects.requireNonNull(getLoginUser()).getTenantId(); + Long tenantId = Optional.ofNullable(getLoginUser()).orElse(new LoginUser()).getTenantId(); list.forEach(item -> item.setTenantId(tenantId)); userDeptMapper.insertBatch(list); } diff --git a/yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java b/yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java index 0381fc9f..6dd4e094 100644 --- a/yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java +++ b/yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.system.controller.admin.sync.vo.user.*; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper; +import cn.iocoder.yudao.module.system.service.dept.PostService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.module.system.service.userdept.UserDeptService; import org.junit.jupiter.api.AfterEach; @@ -32,6 +34,10 @@ public class UserSyncServiceImplTest extends BaseMockitoUnitTest { @Mock private AdminUserService adminUserService; + @Mock + private PostService postService; + @Mock + private UserPostMapper userPostMapper; @Mock private UserDeptService userDeptService;