From c3b0503f8e2ecf955d0e8e4ca9294e6cd5199c0b Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 11:02:30 +0800
Subject: [PATCH] HRM: 员工台账岗位支持多选并同步系统用户岗位
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
index 989e1ce..4d4829a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
@@ -115,10 +115,12 @@
Map<Long, DeptRespDTO> deptMap = CollUtil.isEmpty(deptIds) ? Collections.emptyMap() : deptApi.getDeptMap(deptIds);
// 2. 鎵归噺鑾峰彇宀椾綅淇℃伅
- Set<Long> postIds = employeeList.stream()
- .map(HrmEmployeeDO::getPostId)
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
+ Set<Long> postIds = new HashSet<>();
+ for (HrmEmployeeDO employee : employeeList) {
+ if (StrUtil.isNotBlank(employee.getPostIds())) {
+ postIds.addAll(JSONUtil.toList(employee.getPostIds(), Long.class));
+ }
+ }
Map<Long, PostRespDTO> postMap = CollUtil.isEmpty(postIds) ? Collections.emptyMap() : postApi.getPostMap(postIds);
// 3. 鏀堕泦鎵�鏈夎鑹睮D
@@ -143,9 +145,16 @@
respVO.setDeptName(deptMap.get(employee.getDeptId()).getName());
}
- // 濉厖宀椾綅鍚嶇О
- if (employee.getPostId() != null && postMap.containsKey(employee.getPostId())) {
- respVO.setPostName(postMap.get(employee.getPostId()).getName());
+ // 濉厖宀椾綅淇℃伅
+ if (StrUtil.isNotBlank(employee.getPostIds())) {
+ List<Long> employeePostIds = JSONUtil.toList(employee.getPostIds(), Long.class);
+ respVO.setPostIds(employeePostIds);
+ if (CollUtil.isNotEmpty(employeePostIds)) {
+ respVO.setPostNames(employeePostIds.stream()
+ .filter(postMap::containsKey)
+ .map(id -> postMap.get(id).getName())
+ .collect(Collectors.joining(",")));
+ }
}
// 瑙ｆ瀽 roleIds 骞跺～鍏呰鑹插悕绉�
@@ -195,7 +204,7 @@
// 杈撳嚭绀轰緥鏁版嵁锛屾柟渚夸娇鐢ㄨ�呭弬鑰�
List<HrmEmployeeImportExcelVO> list = Arrays.asList(
HrmEmployeeImportExcelVO.builder().name("寮犱笁").gender(1).phone("13800138000")
- .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊").roleNames("鏅�氱鐞嗗憳")
+ .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊,椤圭洰缁忕悊").roleNames("鏅�氱鐞嗗憳")
.hireDate(LocalDate.of(2020, 3, 1)).employeeStatus(1)
.idCard("320102199001150011").birthday(LocalDate.of(1990, 1, 15))
.nation("姹夋棌").marriageStatus("宸插").age(36).education("鏈").politicalStatus("涓叡鍏氬憳")
--
Gitblit v1.9.3