From e7dd8b490661c994c414c0edc2da1854d9bcef82 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 13:33:12 +0800
Subject: [PATCH] feat(excel): 优化Excel列宽与必填标记并支持巡检附件
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 27 +++++++++++++++++++--------
1 files changed, 19 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 cb63401..65a2ad6 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);
}
@@ -110,7 +120,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);
@@ -127,7 +136,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)) {
@@ -157,15 +165,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());
}
@@ -181,7 +193,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) {
--
Gitblit v1.9.3