From 01617ca39e98458972cf0d3c024d2fb44a99b086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 5 Dec 2025 16:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A8=E9=80=9A=EF=BC=8C=E6=97=A0=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E8=B5=84=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryBill/bo/SalaryBillBO.java | 1 + .../engine/salary/wrapper/SalarySendWrapper.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java index aa32a8829..25a8cde7d 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java @@ -371,6 +371,7 @@ public class SalaryBillBO { } } } + content = content.replace("%salaryInfoId%", Util.null2String(e.get("id"))); try { if (e.get("mobile") != null) { diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 44c8d16fa..32c10dbc2 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -6,6 +6,7 @@ import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; import com.api.browser.util.ConditionFactory; import com.api.browser.util.ConditionType; +import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTable; import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom; @@ -16,6 +17,7 @@ import com.engine.core.impl.Service; import com.engine.salary.constant.SalaryItemConstant; import com.engine.salary.entity.salaryBill.dto.*; import com.engine.salary.entity.salaryBill.param.*; +import com.engine.salary.entity.salaryBill.po.SalarySendInfoPO; import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; @@ -25,6 +27,7 @@ import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.auth.AuthFilterTypeEnum; import com.engine.salary.enums.salarybill.SalarySendStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.salarybill.SalarySendInfoMapper; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; import com.engine.salary.sys.constant.SalarySysConstant; @@ -92,6 +95,10 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); } + private SalarySendInfoMapper getSalarySendInfoMapper() { + return SqlProxyHandle.getProxy(SalarySendInfoMapper.class); + } + /** * 工资单发放列表 @@ -665,9 +672,13 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy * @return */ public Map mySalaryBill(Long salaryInfoId) { - if (user == null) { - throw new SalaryRunTimeException("获取人员信息失败!"); + SalarySendInfoPO salarySendInfo = getSalarySendInfoMapper().getById(salaryInfoId); + if (salarySendInfo == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在")); } + + Long employeeId = salarySendInfo.getEmployeeId(); + User user = new User(Integer.parseInt(employeeId.toString())); return getSalarySendService(user).mySalaryBill(salaryInfoId, (long) user.getUID()); }