diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index 84497238f..0b9357d7c 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -357,7 +357,7 @@ public class SalaryAcctResultBO {
             // 薪资项目的值
             Map<String, Object> map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY));
             // 人员信息字段的值
-            Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()));
+            Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()), e, false );
             for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) {
                 // 员工信息字段的字段类型
                 if (dynamicEmpInfo) {
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
index 9b2bb2e1d..ca2805692 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
@@ -126,5 +126,5 @@ public interface SalaryAcctEmployeeMapper {
 
     void updateIgnoreNull(@Param("salaryAcctEmployeePO")SalaryAcctEmployeePO salaryAcctEmployeePO);
 
-    void lock(SalaryAcctEmployeePO salaryAcctEmployeePO);
+    void lock(@Param("salaryAcctEmployeePO")SalaryAcctEmployeePO salaryAcctEmployeePO,  @Param("now") Date now);
 }
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index f2f324d6f..a1bb197a3 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -1176,9 +1176,10 @@
         UPDATE hrsa_salary_acct_emp
         <set>
             lock_items =
-            #{lockItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
+            #{salaryAcctEmployeePO.lockItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
+            lock_time=#{now},
         </set>
-        WHERE id = #{id} AND delete_type = 0
+        WHERE id = #{salaryAcctEmployeePO.id} AND delete_type = 0
     </update>
 
 </mapper>
diff --git a/src/com/engine/salary/service/SalaryAcctEmployeeService.java b/src/com/engine/salary/service/SalaryAcctEmployeeService.java
index ee9bd2ced..d58bf7290 100644
--- a/src/com/engine/salary/service/SalaryAcctEmployeeService.java
+++ b/src/com/engine/salary/service/SalaryAcctEmployeeService.java
@@ -279,5 +279,5 @@ public interface SalaryAcctEmployeeService {
      */
     void updateIgnoreNull(SalaryAcctEmployeePO salaryAcctEmployeePO);
 
-    void lock(SalaryAcctEmployeePO salaryAcctEmployeePO);
+    void lock(SalaryAcctEmployeePO salaryAcctEmployeePO, Date lockDate);
 }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 0e5d37746..12e2d63e9 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -8,7 +8,6 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.common.LocalDateRange;
-import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@@ -811,7 +810,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 
             salaryAcctEmployees.forEach(salaryAcctEmployeePO -> {
                 salaryAcctEmployeePO.setLockItems(itemIds);
-                lock(salaryAcctEmployeePO);
+                lock(salaryAcctEmployeePO, now);
             });
             // 宁波精华，需要更新支付方式的值
             List<SalaryAcctEmployeePO> salaryAcctEmployeePOList = listByIds(acctEmpIds);
@@ -819,7 +818,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         }else {
             salaryAcctEmployees.forEach(salaryAcctEmployeePO -> {
                 salaryAcctEmployeePO.setLockItems(new ArrayList<>());
-                lock(salaryAcctEmployeePO);
+                lock(salaryAcctEmployeePO, now);
             });
             // 宁波精华，需要更新支付方式的值
             nbjhUpdateZffs(salaryAcctRecord, salaryAcctEmployees, now, lockStatus.getValue());
@@ -1096,7 +1095,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
     }
 
     @Override
-    public void lock(SalaryAcctEmployeePO salaryAcctEmployeePO) {
-        getSalaryAcctEmployeeMapper().lock(salaryAcctEmployeePO);
+    public void lock(SalaryAcctEmployeePO salaryAcctEmployeePO, Date lockDate) {
+        getSalaryAcctEmployeeMapper().lock(salaryAcctEmployeePO, lockDate);
     }
 }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index ce5518991..30ce4b515 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -1029,7 +1029,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
 
         salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
 
-        getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
+        getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO, null);
     }
 
     @Override
@@ -1055,7 +1055,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                 lockItemIds.removeAll(salaryItemIds);
             }
             salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
-            getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
+            getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO, null);
         });
 
     }
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 0b5891202..d44f7b49f 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -1633,6 +1633,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             rows.add(row);
         });
         // 3.表数据
-        return ExcelUtilPlus.genWorkbookV2WithPattern(rows, sheetName);
+        return ExcelUtilPlus.genWorkbookV2WithPattern(rows, sheetName, false);
     }
 }