From 9c7c6de614c0713ea6ca83e2685682fadddeb86a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 27 Jun 2024 16:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E4=BF=A1=E6=81=AF=E5=BF=AB?=
 =?UTF-8?q?=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryacct/bo/CalculateFormulaVarBO.java     | 3 ++-
 .../engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java | 2 +-
 .../engine/salary/service/impl/SalaryAcctExcelServiceImpl.java | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
index 8251ea51f..44575341b 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
@@ -32,6 +32,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import weaver.general.Util;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -555,7 +556,7 @@ public class CalculateFormulaVarBO {
         employeeMap.forEach((key, po) -> {
             // 获取po的状态
             if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) {
-                po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(po.getStatus())));
+                po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(),"1"))));
             }
             List<FormulaVarValue> formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList());
             Map<String, String> map = JsonUtil.parseMap(po, String.class);
diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index 4989bd7f2..f3a419a20 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -305,7 +305,7 @@ public class SalaryAcctResultBO {
                     } else if ("status".equals(salarySobEmpField.getFieldCode())) {
                         map.put("status", e.getStatus());
                     } else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
-                        map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(e.getStatus())));
+                        map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(),"1"))));
                     } else {
                         map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
                     }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index bab6f297d..7f2e440e1 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -389,7 +389,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 //        List<Object> headerList = new ArrayList<>(weaTableColumns);
         List<Object> headerList = new ArrayList<>(finalWeaTableColumns);
         // 查询薪资核算结果
-        queryParam.setDynamicEmpInfo(true);
         List<Map<String, Object>> resultMapList = getSalaryAcctResultService(user).listByParam(queryParam);