zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复单元测试错误

Browse Source 
(cherry picked from commit 481df647b0)
This commit is contained in:
chenbowen
2025-08-28 17:53:22 +08:00
committed by chenbowen
parent 3ee67053ba
commit 689f9acf87
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/userdept/UserDeptServiceImpl.java
View File

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.userdept;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 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.dataobject.userdept.UserDeptDO;
import cn.iocoder.yudao.module.system.dal.mysql.userdept.UserDeptMapper; import cn.iocoder.yudao.module.system.dal.mysql.userdept.UserDeptMapper;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@@ -11,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
import java.util.Collection; import java.util.Collection;
import java.util.List; 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.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
@@ -107,7 +108,7 @@ public class UserDeptServiceImpl implements UserDeptService {
} }
List<UserDeptDO> list = BeanUtils.toBean(createReqVOList, UserDeptDO.class); List<UserDeptDO> 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)); list.forEach(item -> item.setTenantId(tenantId));
userDeptMapper.insertBatch(list); userDeptMapper.insertBatch(list);
} }

6
yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java
View File

@@ -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.sync.vo.user.*;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; 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.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.user.AdminUserService;
import cn.iocoder.yudao.module.system.service.userdept.UserDeptService; import cn.iocoder.yudao.module.system.service.userdept.UserDeptService;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
@@ -32,6 +34,10 @@ public class UserSyncServiceImplTest extends BaseMockitoUnitTest {
@Mock @Mock
private AdminUserService adminUserService; private AdminUserService adminUserService;
@Mock
private PostService postService;
@Mock
private UserPostMapper userPostMapper;
@Mock @Mock
private UserDeptService userDeptService; private UserDeptService userDeptService;