From 7cb2c3670fe5c16c6fa75fb3f6d388a2ad74d54a Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 30 Oct 2023 11:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B0=83=E8=96=AA=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=99=84=E4=BB=B6=E6=B2=A1=E4=BC=A0=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E8=B7=B3=E8=BF=87action=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/action/BatEditSalaryExcelAction.java | 6 +++++- .../engine/salary/action/CheckBatEditSalaryExcelAction.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/action/BatEditSalaryExcelAction.java b/src/com/engine/salary/action/BatEditSalaryExcelAction.java index adddc2de9..e0cbf422d 100644 --- a/src/com/engine/salary/action/BatEditSalaryExcelAction.java +++ b/src/com/engine/salary/action/BatEditSalaryExcelAction.java @@ -7,6 +7,7 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum; import com.engine.salary.service.SalaryArchiveExcelService; import com.engine.salary.service.impl.SalaryArchiveExcelServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; import weaver.hrm.User; @@ -54,7 +55,10 @@ public class BatEditSalaryExcelAction implements Action { property -> Util.null2String(property.getValue()))); String docId = fieldMap.get(batSalaryExcelField); - + if (StringUtils.isBlank(docId)) { + log.error("批量调薪检查附件id为null"); + return SUCCESS; + } RecordSet rs = new RecordSet(); String queryImageId = "select imagefileid from docimagefile where docid = ?"; rs.executeQuery(queryImageId, docId); diff --git a/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java b/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java index 408b2fa7f..f1d6f2aec 100644 --- a/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java +++ b/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java @@ -7,6 +7,7 @@ import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum; import com.engine.salary.service.SalaryArchiveExcelService; import com.engine.salary.service.impl.SalaryArchiveExcelServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; import weaver.hrm.User; @@ -54,7 +55,10 @@ public class CheckBatEditSalaryExcelAction implements Action { property -> Util.null2String(property.getValue()))); String docId = fieldMap.get(batSalaryExcelField); - + if (StringUtils.isBlank(docId)) { + log.error("批量调薪检查附件id为null"); + return SUCCESS; + } RecordSet rs = new RecordSet(); String queryImageId = "select imagefileid from docimagefile where docid = ?"; rs.executeQuery(queryImageId, docId);