From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 7cb7d78..de53ca5 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
@@ -11,9 +11,12 @@
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
import cn.iocoder.yudao.module.system.convert.user.UserConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+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.service.dept.DeptService;
+import cn.iocoder.yudao.module.system.service.permission.PermissionService;
+import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -33,6 +36,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -49,6 +54,10 @@
private AdminUserService userService;
@Resource
private DeptService deptService;
+ @Resource
+ private RoleService roleService;
+ @Resource
+ private PermissionService permissionService;
@PostMapping("/create")
@Operation(summary = "鏂板鐢ㄦ埛")
@@ -148,6 +157,32 @@
return success(UserConvert.INSTANCE.convertSimpleList(list, deptMap));
}
+ @GetMapping("/list-by-role-code")
+ @Operation(summary = "鑾峰緱鎸囧畾瑙掕壊缂栫爜鐨勭敤鎴风簿绠�淇℃伅鍒楄〃", description = "鍙寘鍚寮�鍚殑鐢ㄦ埛锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
+ @Parameter(name = "code", description = "瑙掕壊缂栫爜", required = true, example = "production_submit_work")
+ public CommonResult<List<UserSimpleRespVO>> getUserListByRoleCode(@RequestParam("code") String code) {
+ // 1. 鏌ヨ瑙掕壊
+ RoleDO role = roleService.getRoleByCode(code);
+ if (role == null) {
+ return success(Collections.emptyList());
+ }
+ // 2. 鏌ヨ鎷ユ湁璇ヨ鑹茬殑鐢ㄦ埛缂栧彿
+ Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(Collections.singletonList(role.getId()));
+ if (CollUtil.isEmpty(userIds)) {
+ return success(Collections.emptyList());
+ }
+ // 3. 鏌ヨ鐢ㄦ埛锛屽彧淇濈暀寮�鍚姸鎬�
+ List<AdminUserDO> list = userService.getUserList(userIds).stream()
+ .filter(user -> CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus()))
+ .collect(Collectors.toList());
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+ // 4. 鎷兼帴閮ㄩ棬鏁版嵁
+ Map<Long, DeptDO> deptMap = deptService.getDeptMap(convertList(list, AdminUserDO::getDeptId));
+ return success(UserConvert.INSTANCE.convertSimpleList(list, deptMap));
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢ㄦ埛璇︽儏")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@@ -183,7 +218,7 @@
// 鎵嬪姩鍒涘缓瀵煎嚭 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(),
+ .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()
);
@@ -223,7 +258,7 @@
@GetMapping("/list-by-nickname")
@Operation(summary = "鎸夋樀绉版ā绯婃悳绱㈢敤鎴风簿绠�淇℃伅", description = "鐢ㄤ簬鍔犲ソ鍙嬬瓑鍦烘櫙锛涘厤閴存潈锛涘綋鍓嶄粎鎸夋樀绉板尮閰�")
- @Parameter(name = "nickname", description = "鏄电О鍏抽敭璇�", required = true, example = "鑺嬮亾")
+ @Parameter(name = "nickname", description = "鏄电О鍏抽敭璇�", required = true, example = "瓒呯骇绠＄悊鍛�")
public CommonResult<List<UserSimpleRespVO>> getSimpleUserListByNickname(@RequestParam("nickname") String nickname) {
if (StrUtil.isBlank(nickname)) {
return success(Collections.emptyList());
--
Gitblit v1.9.3