From ce96310177bdd6d24ac90bd6f92d8def30b680af Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 13:58:23 +0800
Subject: [PATCH] fix(hrm): 修复修改员工时的「部门不存在」与「系统异常」
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/salary/HrmSalaryCalculationServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
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 ea55ce7..2d8be45 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
@@ -235,7 +235,9 @@
HrmSocialSecuritySchemeDO scheme,
LocalDate effectiveDate) {
// 璁＄畻搴斿彂钖祫
- BigDecimal baseSalary = employeeSalary.getBaseSalary() != null ? employeeSalary.getBaseSalary() : BigDecimal.ZERO;
+ // 鍩烘湰宸ヨ祫缁熶竴鍙栥�屽憳宸ヤ俊鎭�嶄腑缁存姢鐨勫熀鏈柂璧勶紙钖叕妗ｆ閲岀殑 baseSalary 涓嶅啀浣滀负鏍哥畻鏉ユ簮锛�
+ // 閬垮厤鍛樺伐淇℃伅涓庤柂閰。妗堜笉涓�鑷存椂锛屾牳绠楃粨鏋滀笌鍛樺伐妗ｆ瀵逛笉涓婏級
+ BigDecimal baseSalary = employee.getBaseSalary() != null ? employee.getBaseSalary() : BigDecimal.ZERO;
BigDecimal performanceSalary = employeeSalary.getPerformanceSalary() != null ? employeeSalary.getPerformanceSalary() : BigDecimal.ZERO;
BigDecimal mealAllowance = employeeSalary.getMealAllowance() != null ? employeeSalary.getMealAllowance() : BigDecimal.ZERO;
BigDecimal transportAllowance = employeeSalary.getTransportAllowance() != null ? employeeSalary.getTransportAllowance() : BigDecimal.ZERO;
@@ -683,6 +685,19 @@
calculation.setConfirmTime(exist.getConfirmTime());
calculation.setConfirmUserId(exist.getConfirmUserId());
calculation.setPaymentTime(exist.getPaymentTime());
+ // 閲戦瀛楁涓� null 鏃剁粺涓�鎸� 0 澶勭悊锛歁yBatis-Plus 鐨� updateById 榛樿蹇界暐 null锛�
+ // 鍚﹀垯浼氬嚭鐜般�屽疄鍙戝伐璧勬寜 0 璁＄畻銆佷絾鏄庣粏浠嶄繚鐣欐棫鍊笺�嶇殑涓嶄竴鑷�
+ calculation.setBaseSalary(nvl(calculation.getBaseSalary()));
+ calculation.setPerformanceSalary(nvl(calculation.getPerformanceSalary()));
+ calculation.setOvertimePay(nvl(calculation.getOvertimePay()));
+ calculation.setMealAllowance(nvl(calculation.getMealAllowance()));
+ calculation.setTransportAllowance(nvl(calculation.getTransportAllowance()));
+ calculation.setOtherAllowance(nvl(calculation.getOtherAllowance()));
+ calculation.setSocialSecurityDeduction(nvl(calculation.getSocialSecurityDeduction()));
+ calculation.setHousingFundDeduction(nvl(calculation.getHousingFundDeduction()));
+ calculation.setTaxDeduction(nvl(calculation.getTaxDeduction()));
+ calculation.setOtherDeduction(nvl(calculation.getOtherDeduction()));
+ calculation.setLeaveDeduction(nvl(calculation.getLeaveDeduction()));
// 瀹炲彂宸ヨ祫鐢卞悗绔噸绠楋紝閬垮厤鍓嶇浼犲叆鍊间笌鏄庣粏涓嶄竴鑷�
calculation.setActualSalary(calcActualSalary(calculation));
salaryCalculationMapper.updateById(calculation);
--
Gitblit v1.9.3