qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

This commit is contained in:
钱涛 2026-02-05 15:03:49 +08:00
parent eeba5870bd 49738114fc
commit 50c84eb11e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -620,9 +620,7 @@
</trim>
<trim prefix="pay_end_date =case" suffix="end,">
<foreach collection="collection" item="item" index="index">
<if test="item.payEndDate!=null">
when id=#{item.id} then #{item.payEndDate}
</if>
when id=#{item.id} then #{item.payEndDate}
</foreach>
</trim>
<trim prefix="update_time =case" suffix="end,">
@ -650,9 +648,7 @@
<if test="item.payStartDate != null">
pay_start_date=#{item.payStartDate},
</if>
<if test="item.payEndDate != null">
pay_end_date=#{item.payEndDate},
</if>
</set>
WHERE id = #{item.id} AND delete_type = 0