From 6b8d4410feb6771cc2c5fbf5f398112595a9dc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 27 Nov 2025 11:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- .../salary/action/WdlSalaryArchiveTriggerAction.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index c558fd72d..974d6e825 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=3.0.2.2504.04 +version=3.0.2.2504.04.s openFormulaForcedEditing=false \ No newline at end of file diff --git a/src/com/engine/salary/action/WdlSalaryArchiveTriggerAction.java b/src/com/engine/salary/action/WdlSalaryArchiveTriggerAction.java index eb67ecbb4..d72d2d339 100644 --- a/src/com/engine/salary/action/WdlSalaryArchiveTriggerAction.java +++ b/src/com/engine/salary/action/WdlSalaryArchiveTriggerAction.java @@ -76,7 +76,7 @@ public class WdlSalaryArchiveTriggerAction implements Action { getSalaryArchiveItemWrapper(user).saveSalaryItem4Workflow(param); } catch (Exception e) { requestInfo.getRequestManager().setMessage(e.getMessage()); - log.error("万德隆调薪定薪触发action 单个调薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage()); + log.error("万德隆调薪定薪触发action 单个调薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage(),e); return FAILURE_AND_CONTINUE; } } else if (po.getOperateType().equals(WdlArchiveWorkflowEnum.BATCH_EDIT.getValue())) { @@ -85,7 +85,7 @@ public class WdlSalaryArchiveTriggerAction implements Action { getSalaryArchiveItemWrapper(user).batchAdjustSalaryItem4Workflow(param); } catch (Exception e) { requestInfo.getRequestManager().setMessage(e.getMessage()); - log.error("万德隆调薪定薪触发action 批量调薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage()); + log.error("万德隆调薪定薪触发action 批量调薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage(),e); return FAILURE_AND_CONTINUE; } } else if (po.getOperateType().equals(WdlArchiveWorkflowEnum.SINGLE_INIT.getValue())) { @@ -109,7 +109,7 @@ public class WdlSalaryArchiveTriggerAction implements Action { getSalaryArchiveItemWrapper(user).initSalaryItem4Workflow(param); } catch (Exception e) { requestInfo.getRequestManager().setMessage(e.getMessage()); - log.error("万德隆调薪定薪触发action 单个定薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage()); + log.error("万德隆调薪定薪触发action 单个定薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage(),e); return FAILURE_AND_CONTINUE; } } else if (po.getOperateType().equals(WdlArchiveWorkflowEnum.BATCH_INIT.getValue())) { @@ -132,7 +132,7 @@ public class WdlSalaryArchiveTriggerAction implements Action { getSalaryArchiveItemWrapper(user).batchInitSalaryItem4Workflow(param); } catch (Exception e) { requestInfo.getRequestManager().setMessage(e.getMessage()); - log.error("万德隆调薪定薪触发action 批量定薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage()); + log.error("万德隆调薪定薪触发action 批量定薪异常 requestId:{} poId:{} msg:{}", requestInfo.getRequestid(),po.getId(), e.getMessage(),e); return FAILURE_AND_CONTINUE; } }