diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java index 25a8cde7d..e6f2d7a53 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java @@ -371,7 +371,8 @@ public class SalaryBillBO { } } } - content = content.replace("%salaryInfoId%", Util.null2String(e.get("id"))); + String salaryInfoCode = AESEncryptUtil.encrypt4SalaryBill(Util.null2String(e.get("id"))); + content = content.replace("%salaryInfoCode%", salaryInfoCode); try { if (e.get("mobile") != null) { diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 23e06b6ee..7e7ea52dd 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -702,6 +702,15 @@ public class SalaryBillController { return new ResponseResult>(user).run(getSalarySendWrapper(user)::mySalaryBill, salaryInfoId); } + @GET + @Path("/outSalaryBill") + @Produces(MediaType.APPLICATION_JSON) + public String outSalaryBill(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryInfoCode") String salaryInfoCode) { + User user = null; + user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getSalarySendWrapper(user)::outSalaryBill, salaryInfoCode); + } + /** * 确认工资单 * diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 32c10dbc2..112217745 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -15,6 +15,7 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.constant.SalaryItemConstant; +import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.salaryBill.dto.*; import com.engine.salary.entity.salaryBill.param.*; import com.engine.salary.entity.salaryBill.po.SalarySendInfoPO; @@ -672,6 +673,15 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy * @return */ public Map mySalaryBill(Long salaryInfoId) { + if (user == null) { + throw new SalaryRunTimeException("获取人员信息失败!"); + } + return getSalarySendService(user).mySalaryBill(salaryInfoId, (long) user.getUID()); + } + + public Map outSalaryBill(String salaryInfoCode) { + salaryInfoCode = AESEncryptUtil.decrypt4SalaryBill(salaryInfoCode); + long salaryInfoId = Long.parseLong(salaryInfoCode); SalarySendInfoPO salarySendInfo = getSalarySendInfoMapper().getById(salaryInfoId); if (salarySendInfo == null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));