From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 de53ca5..dac7625 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;
@@ -43,6 +44,9 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_IMPORT_FILE_EMPTY;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_IMPORT_FILE_INVALID;
@Tag(name = "绠＄悊鍚庡彴 - 鐢ㄦ埛")
@RestController
@@ -111,7 +115,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢ㄦ埛鍒嗛〉鍒楄〃")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<PageResult<UserRespVO>> getUserPage(@Valid UserPageReqVO pageReqVO) {
// 鑾峰緱鐢ㄦ埛鍒嗛〉鍒楄〃
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
@@ -128,7 +131,6 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鐢ㄦ埛璇︽儏鍒楄〃")
@Parameter(name = "ids", description = "缂栧彿鍒楄〃", required = true, example = "[1024]")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<List<UserRespVO>> getUserList(@RequestParam("ids") List<Long> ids) {
List<AdminUserDO> list = userService.getUserList(ids);
if (CollUtil.isEmpty(list)) {
@@ -186,7 +188,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢ㄦ埛璇︽儏")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('system:user:query')")
public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) {
AdminUserDO user = userService.getUser(id);
if (user == null) {
@@ -213,17 +214,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")
@@ -235,7 +242,16 @@
@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 {
- List<UserImportExcelVO> list = ExcelUtils.read(file, UserImportExcelVO.class);
+ // 绌烘枃浠� / 闈炴硶鏂囦欢缁欏嚭鏄庣‘鎻愮ず锛岄伩鍏嶅簳灞傚紓甯稿彉鎴愩�岀郴缁熷紓甯搞��
+ if (file == null || file.isEmpty()) {
+ throw exception(USER_IMPORT_FILE_EMPTY);
+ }
+ List<UserImportExcelVO> list;
+ try {
+ list = ExcelUtils.read(file, UserImportExcelVO.class);
+ } catch (Exception ex) {
+ throw exception(USER_IMPORT_FILE_INVALID);
+ }
return success(userService.importUserList(list, updateSupport));
}
--
Gitblit v1.9.3