From 730f9b0c25a6c111dab1ea4a1ac5e1da9a48f765 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 19:58:35 +0800
Subject: [PATCH] fix: 修复全量接口扫描发现的 500（29 个降至 0，member 模块按要求跳过）
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index c89d3a3..22479fa 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
@@ -210,17 +211,23 @@
}
@GetMapping("/get-import-template")
- @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
+ @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘", description = "閮ㄩ棬鎸夐儴闂ㄥ悕绉板～鍐欙紝绀轰緥鍙栬嚜褰撳墠绯荤粺鐪熷疄閮ㄩ棬")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 绀轰緥鍙栧綋鍓嶇湡瀹為儴闂ㄥ悕绉帮紝閬垮厤浣跨敤鑰呯収鎶勫畼鏂� demo 瀵艰嚧銆岄儴闂ㄤ笉瀛樺湪銆�
+ List<DeptDO> depts = deptService.getDeptList(new DeptListReqVO());
+ String sampleDept1 = CollUtil.isNotEmpty(depts) ? depts.get(0).getName() : "璇峰～鍐欓儴闂ㄥ悕绉�";
+ String sampleDept2 = depts.size() > 1 ? depts.get(1).getName() : sampleDept1;
+
List<UserImportExcelVO> list = Arrays.asList(
- UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
- .nickname("瓒呯骇绠＄悊鍛�").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
- UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
- .nickname("婧愮爜").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
+ UserImportExcelVO.builder().username("zhangsan").deptName(sampleDept1).email("zhangsan@example.com")
+ .mobile("13800000001").nickname("寮犱笁")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+ UserImportExcelVO.builder().username("lisi").deptName(sampleDept2).email("lisi@example.com")
+ .mobile("13800000002").nickname("鏉庡洓")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
- // 杈撳嚭
- ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
+ // 鏃ユ湡鍒楁寜鏂囨湰杈撳嚭锛岄伩鍏嶆樉绀烘垚 Excel 搴忓垪鍙�
+ ExcelUtils.writeTemplate(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -232,6 +239,7 @@
@PreAuthorize("@ss.hasPermission('system:user:import')")
public CommonResult<UserImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
@RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ // 绌烘枃浠� / 鍧忔枃浠� / 妯℃澘涓嶅尮閰嶇瓑锛孍xcelUtils.read 宸茬粺涓�杞崲涓哄彲璇荤殑涓枃鎻愮ず
List<UserImportExcelVO> list = ExcelUtils.read(file, UserImportExcelVO.class);
return success(userService.importUserList(list, updateSupport));
}
--
Gitblit v1.9.3