From 155319d1e4f8e61f5f3b60a783be035f03b47c66 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期二, 03 十一月 2026 12:16:50 +0800
Subject: [PATCH] fix(hrm): 修复各列表员工姓名全空 + 保存核算重复插入

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java   |    4 +-
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java           |   10 +++--
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java    |    4 +-
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java  |    2 
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java |    4 +-
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java       |   18 +++++---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java               |   19 +++++++++
 7 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
index 3ca789b..0e7dc72 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
@@ -77,9 +77,9 @@
             return success(null);
         }
         HrmAttendanceExceptionRespVO respVO = BeanUtils.toBean(attendanceException, HrmAttendanceExceptionRespVO.class);
-        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
+        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄郴缁熻处鍙� ID锛屼笉鏄憳宸ユ。妗� ID锛�
         if (attendanceException.getUserId() != null) {
-            HrmEmployeeDO employee = employeeService.getEmployee(attendanceException.getUserId());
+            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(attendanceException.getUserId());
             if (employee != null) {
                 respVO.setUserName(employee.getName());
             }
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 9f94ad3..1ee8810 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -164,9 +164,9 @@
             return success(null);
         }
         HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(attendanceRecord, HrmAttendanceRecordRespVO.class);
-        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
+        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄郴缁熻处鍙� ID锛屼笉鏄憳宸ユ。妗� ID锛�
         if (attendanceRecord.getUserId() != null) {
-            HrmEmployeeDO employee = employeeService.getEmployee(attendanceRecord.getUserId());
+            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(attendanceRecord.getUserId());
             if (employee != null) {
                 respVO.setUserName(employee.getName());
                 respVO.setPhone(employee.getPhone());
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
index a684c8a..5ee9e99 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
@@ -105,8 +105,8 @@
             return success(null);
         }
         HrmAttendanceSummaryRespVO respVO = BeanUtils.toBean(summary, HrmAttendanceSummaryRespVO.class);
-        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭�
-        HrmEmployeeDO employee = employeeService.getEmployee(userId);
+        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄郴缁熻处鍙� ID锛屼笉鏄憳宸ユ。妗� ID锛�
+        HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
         if (employee != null) {
             respVO.setUserName(employee.getName());
         }
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
index db54d53..398c086 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
@@ -193,7 +193,7 @@
      */
     private void fillEmployeeInfo(HrmEmployeeSocialSecurityRespVO respVO, Long userId) {
         // userId 鏄憳宸D锛岄�氳繃鍛樺伐琛ㄨ幏鍙栧鍚嶅拰閮ㄩ棬
-        HrmEmployeeDO employee = employeeService.getEmployee(userId);
+        HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
         if (employee != null) {
             respVO.setUserName(employee.getName());
             if (employee.getDeptId() != null) {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index 8604682..e55d7de 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -90,16 +90,18 @@
      * 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
      */
     private void fillUserInfo(List<HrmSalaryCalculationRespVO> respList, List<HrmSalaryCalculationDO> calculationList) {
-        // userId 鏄憳宸D锛屾壒閲忚幏鍙栧憳宸ヤ俊鎭�
-        Set<Long> employeeIds = calculationList.stream()
+        // 娉ㄦ剰锛氭牳绠楄褰曠殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+        // 涓嶆槸鍛樺伐妗f涓婚敭锛坔rm_employee.id锛夈�傜敤 getEmployee 浼氭案杩滄煡涓嶅埌锛�
+        // 瀵艰嚧鍒楄〃閲屻�屽憳宸ュ鍚嶃�嶄竴鍒楀叏绌恒�傚繀椤荤敤 getEmployeeByUserId銆�
+        Set<Long> userIds = calculationList.stream()
                 .map(HrmSalaryCalculationDO::getUserId)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
         Map<Long, HrmEmployeeDO> employeeMap = new HashMap<>();
-        for (Long employeeId : employeeIds) {
-            HrmEmployeeDO employee = employeeService.getEmployee(employeeId);
+        for (Long userId : userIds) {
+            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
             if (employee != null) {
-                employeeMap.put(employeeId, employee);
+                employeeMap.put(userId, employee);
             }
         }
 
@@ -133,9 +135,11 @@
             return success(null);
         }
         HrmSalaryCalculationRespVO respVO = BeanUtils.toBean(salaryCalculation, HrmSalaryCalculationRespVO.class);
-        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭紙userId 鏄憳宸D锛�
+        // 濉厖鍛樺伐鍜岄儴闂ㄤ俊鎭�
+        // 娉ㄦ剰锛氭牳绠楄褰曠殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+        // 涓嶆槸鍛樺伐妗f涓婚敭锛坔rm_employee.id锛夛紝蹇呴』鐢� getEmployeeByUserId 鏌�
         if (salaryCalculation.getUserId() != null) {
-            HrmEmployeeDO employee = employeeService.getEmployee(salaryCalculation.getUserId());
+            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(salaryCalculation.getUserId());
             if (employee != null) {
                 respVO.setUserName(employee.getName());
             }
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
index ebb1fdd..b2d742b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
@@ -140,15 +140,17 @@
      */
     private void fillUserInfo(List<HrmSalaryPaymentDetailRespVO> respList, List<HrmSalaryPaymentDetailDO> detailList) {
         // 鎵归噺鑾峰彇鍛樺伐淇℃伅
-        Set<Long> employeeIds = detailList.stream()
+        // 娉ㄦ剰锛氬彂鏀炬槑缁嗙殑 userId 瀛樼殑鏄�岀郴缁熻处鍙� ID銆嶏紙system_users.id锛夛紝
+        // 涓嶆槸鍛樺伐妗f涓婚敭锛坔rm_employee.id锛夛紝蹇呴』鐢� getEmployeeByUserId 鏌�
+        Set<Long> userIds = detailList.stream()
                 .map(HrmSalaryPaymentDetailDO::getUserId)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
         Map<Long, HrmEmployeeDO> employeeMap = new HashMap<>();
-        for (Long employeeId : employeeIds) {
-            HrmEmployeeDO employee = employeeService.getEmployee(employeeId);
+        for (Long userId : userIds) {
+            HrmEmployeeDO employee = employeeService.getEmployeeByUserId(userId);
             if (employee != null) {
-                employeeMap.put(employeeId, employee);
+                employeeMap.put(userId, employee);
             }
         }
         // 鎵归噺鑾峰彇閮ㄩ棬淇℃伅
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
index 7f1d49e..eeee784 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java
@@ -642,7 +642,24 @@
     public void saveSalaryCalculationList(List<HrmSalaryCalculationDO> calculationList) {
         for (HrmSalaryCalculationDO calculation : calculationList) {
             if (calculation.getId() == null) {
-                // 鏂板璁板綍锛岀敓鎴愭牳绠楀崟鍙�
+                // 鏂板鍓嶅厛鏌ラ噸锛氬悓涓�鍛樺伐锛堢郴缁熻处鍙� ID锛�+ 鍚屼竴鍛ㄦ湡 鍙厑璁稿瓨鍦ㄤ竴鏉¤褰曘��
+                // 鍓嶇銆岄瑙堟暟鎹� 鈫� 淇濆瓨鏍哥畻銆嶈蛋鐨勫氨鏄繖閲岋紝涓嶆煡閲嶄細閲嶅鎻掑叆銆�
+                List<HrmSalaryCalculationDO> existList = salaryCalculationMapper
+                        .selectListByUserIdAndPeriod(calculation.getUserId(), calculation.getPeriod());
+                if (CollUtil.isNotEmpty(existList)) {
+                    HrmSalaryCalculationDO existing = existList.get(0);
+                    // 宸茬‘璁�/宸插彂鏀剧殑璁板綍涓嶅厑璁歌瑕嗙洊锛岀洿鎺ヨ烦杩�
+                    if (existing.getStatus() != null && existing.getStatus() != 0) {
+                        continue;
+                    }
+                    // 寰呯‘璁ょ殑璁板綍锛氳鐩栭噸绠楃粨鏋滐紝淇濈暀鍘熷崟鍙�
+                    calculation.setId(existing.getId());
+                    calculation.setNo(existing.getNo());
+                    calculation.setStatus(0);
+                    salaryCalculationMapper.updateById(calculation);
+                    continue;
+                }
+                // 纭疄鏄柊澧烇紝鐢熸垚鏍哥畻鍗曞彿
                 String no = noRedisDAO.generateSalaryCalculationNo();
                 while (salaryCalculationMapper.selectByNo(no) != null) {
                     no = noRedisDAO.generateSalaryCalculationNo();

--
Gitblit v1.9.3