From 68317d44b233f28150336bbf3aa3a32400552437 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 11:02:08 +0800
Subject: [PATCH] fix(excel): 导入模板日期改为文本显示，修复显示为 Excel 序列号
---
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
index 370ce3c..446281d 100644
--- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
+++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
@@ -11,6 +11,7 @@
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
@@ -23,6 +24,7 @@
import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.mq.producer.user.AdminUserProducer;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
@@ -85,6 +87,8 @@
private ConfigApi configApi;
@MockitoBean
private OAuth2TokenService oauth2TokenService;
+ @MockitoBean
+ private AdminUserProducer adminUserProducer;
@BeforeEach
public void before() {
@@ -419,6 +423,7 @@
o.setMobile(randomMobile());
});
// mock 鏂规硶锛屾ā鎷熷け璐�
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList());
doThrow(new ServiceException(DEPT_NOT_FOUND)).when(deptService).validateDeptList(any());
// 璋冪敤
@@ -442,12 +447,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// mock passwordEncoder 鐨勬柟娉�
when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java");
@@ -478,12 +483,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), false);
@@ -510,12 +515,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
--
Gitblit v1.9.3