From 66b16594014e17d889059404d31ec681de62cc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 20 Jun 2025 11:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E8=AE=B0=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml   | 6 ++++++
 .../salary/service/impl/SalaryAcctResultServiceImpl.java    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 224bf7aaf..76646f636 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -88,6 +88,7 @@
         jobcall,
         jobcall_id,
         status,
+        mark_items,
         account_type)
         VALUES
         <foreach collection="collection" item="emp" separator=",">
@@ -113,6 +114,7 @@
             #{emp.jobcall},
             #{emp.jobcallId},
             #{emp.status},
+            #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
             #{emp.accountType}
             )
         </foreach>
@@ -130,6 +132,7 @@
         jobcall,
         jobcall_id,
         status,
+        mark_items,
         account_type
         )
         <foreach collection="collection" item="emp" separator="union all">
@@ -155,6 +158,7 @@
             #{emp.jobcall,jdbcType=VARCHAR},
             #{emp.jobcallId,jdbcType=DOUBLE},
             #{emp.status,jdbcType=VARCHAR},
+            #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
             #{emp.accountType,jdbcType=INTEGER}
             from dual
         </foreach>
@@ -173,6 +177,7 @@
             jobcall,
             jobcall_id,
             status,
+            mark_items,
             account_type
             )
             VALUES
@@ -198,6 +203,7 @@
             #{emp.jobcall},
             #{emp.jobcallId},
             #{emp.status},
+            #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
             #{emp.accountType}
             )
         </foreach>
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index b0f0d6c46..1df93d2d1 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -1068,7 +1068,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             markItemIds.removeIf(salaryItemId::equals);
         }
 
-        salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(markItemIds)));
+        salaryAcctEmployeePO.setMarkItems(Lists.newArrayList(new HashSet(markItemIds)));
 
         getSalaryAcctEmployeeService(user).mark(salaryAcctEmployeePO);
     }