From b471ab5edf72439cf6e37c4635c07e7a5fc08a4f Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 19:10:14 +0800
Subject: [PATCH] fix(excel): Excel 导入报错统一转为可读中文提示，不再出现「系统异常」500
---
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 68c8510..067579c 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
@@ -15,6 +15,7 @@
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
@@ -416,21 +417,22 @@
*/
@Test
public void testImportUserList_01() {
- // 鍑嗗鍙傛暟
+ // 鍑嗗鍙傛暟锛氶儴闂ㄥ悕绉板湪绯荤粺涓笉瀛樺湪
UserImportExcelVO importUser = randomPojo(UserImportExcelVO.class, o -> {
+ o.setDeptName("涓嶅瓨鍦ㄧ殑閮ㄩ棬-" + System.currentTimeMillis());
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock 鏂规硶锛屾ā鎷熷け璐�
- doThrow(new ServiceException(DEPT_NOT_FOUND)).when(deptService).validateDeptList(any());
+ // mock锛氱郴缁熶腑娌℃湁鍖归厤鐨勯儴闂�
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList());
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
- // 鏂█
+ // 鏂█锛氳琛屽洜閮ㄩ棬涓嶅瓨鍦ㄨ�屽け璐�
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(0, respVO.getUpdateUsernames().size());
assertEquals(1, respVO.getFailureUsernames().size());
- assertEquals(DEPT_NOT_FOUND.getMsg(), respVO.getFailureUsernames().get(importUser.getUsername()));
+ assertTrue(respVO.getFailureUsernames().get(importUser.getUsername()).contains("涓嶅瓨鍦�"));
}
/**
@@ -446,10 +448,13 @@
o.setMobile(randomMobile());
});
// mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// mock passwordEncoder 鐨勬柟娉�
when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java");
@@ -481,11 +486,13 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 璋冪敤
@@ -513,11 +520,13 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // 閮ㄩ棬宸叉敼涓烘寜鍚嶇О瀵煎叆锛歮ock getDeptList 杩斿洖涓�涓彲鍖归厤鐨勯儴闂�
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
+ o.setId(1L);
+ o.setName(importUser.getDeptName());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
// 璋冪敤
--
Gitblit v1.9.3