From 46d1b5c5ce9020a1022c3df492685e0d261408df Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 21:04:53 +0800
Subject: [PATCH] fix(system): 用户导入模板列名与页面统一，补齐部门/岗位/初始密码列
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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 cb63401..e855b2d 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
@@ -42,6 +42,8 @@
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_POST_NOT_EMPTY;
@Tag(name = "绠＄悊鍚庡彴 - 鐢ㄦ埛")
@RestController
@@ -62,6 +64,10 @@
@Operation(summary = "鏂板鐢ㄦ埛")
@PreAuthorize("@ss.hasPermission('system:user:create')")
public CommonResult<Long> createUser(@Valid @RequestBody UserSaveReqVO reqVO) {
+ // 鏍￠獙宀椾綅蹇呭～
+ if (CollUtil.isEmpty(reqVO.getPostIds())) {
+ throw exception(USER_POST_NOT_EMPTY);
+ }
Long id = userService.createUser(reqVO);
return success(id);
}
@@ -70,6 +76,10 @@
@Operation(summary = "淇敼鐢ㄦ埛")
@PreAuthorize("@ss.hasPermission('system:user:update')")
public CommonResult<Boolean> updateUser(@Valid @RequestBody UserSaveReqVO reqVO) {
+ // 鏍￠獙宀椾綅蹇呭～
+ if (CollUtil.isEmpty(reqVO.getPostIds())) {
+ throw exception(USER_POST_NOT_EMPTY);
+ }
userService.updateUser(reqVO);
return success(true);
}
@@ -157,15 +167,19 @@
}
@GetMapping("/list-by-role-code")
- @Operation(summary = "閫氳繃瑙掕壊鏍囪瘑鑾峰彇鐢ㄦ埛绮剧畝淇℃伅鍒楄〃", description = "鍙寘鍚嫢鏈夎瑙掕壊鐨勭敤鎴凤紝涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- @Parameter(name = "code", description = "瑙掕壊鏍囪瘑", required = true, example = "admin")
+ @Operation(summary = "閫氳繃瑙掕壊鏍囪瘑鑾峰彇鐢ㄦ埛绮剧畝淇℃伅鍒楄〃", description = "鍙寘鍚嫢鏈夎繖浜涜鑹茬殑鐢ㄦ埛锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」銆傛敮鎸侀�楀彿鍒嗛殧鐨勫涓鑹叉爣璇�")
+ @Parameter(name = "code", description = "瑙掕壊鏍囪瘑锛屾敮鎸佸涓紝閫楀彿鍒嗛殧", required = true, example = "admin,user")
public CommonResult<List<UserSimpleRespVO>> getSimpleUserListByRoleCode(
@RequestParam("code") String code) {
- RoleDO role = roleService.getRoleByCode(code);
- if (role == null) {
+ if (StrUtil.isBlank(code)) {
return success(Collections.emptyList());
}
- Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(Collections.singleton(role.getId()));
+ List<String> codes = StrUtil.split(code, ",");
+ List<RoleDO> roles = roleService.getRoleListByCodes(codes);
+ if (CollUtil.isEmpty(roles)) {
+ return success(Collections.emptyList());
+ }
+ Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(convertList(roles, RoleDO::getId));
if (CollUtil.isEmpty(userIds)) {
return success(Collections.emptyList());
}
@@ -210,12 +224,14 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo锛氶儴闂ㄣ�佸矖浣嶈濉啓绯荤粺閲屽凡缁忓瓨鍦ㄧ殑鍚嶇О锛涘涓矖浣嶇敤銆屻�併�嶅垎闅�
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").nickname("寮犱笁").dept("缁煎悎绠＄悊閮�").post("鏅�氬憳宸�")
+ .email("zhangsan@example.com").mobile("15601691300").password("123456")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+ UserImportExcelVO.builder().username("lisi").nickname("鏉庡洓").dept("缁煎悎绠＄悊閮�").post("鏅�氬憳宸ャ�佺彮缁勯暱")
+ .email("lisi@example.com").mobile("15601701300").password("123456")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
// 杈撳嚭
ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
--
Gitblit v1.9.3