From cdf5605fb5caa0da0f134893bac350785250ea8a Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 11:21:19 +0800
Subject: [PATCH] feat(mes): 基础参数与工序绑定，报工填写绑定的参数字段
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..b206f45 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());
}
--
Gitblit v1.9.3