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);