Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

Merge branch 'release/个税版本' into release/个税&业务线
Merge branch 'release/2.19.1.2501.01' into release/个税版本
2026-02-10 16:57:04 +08:00 · 2026-02-10 16:56:59 +08:00 · 2026-02-10 16:54:02 +08:00 · 2026-02-05 15:03:49 +08:00 · 2026-02-05 15:03:31 +08:00
1 changed files with 1 additions and 5 deletions
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@ -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
Author	SHA1	Message	Date
钱涛	101bbf11d3	Merge branch 'release/3.0.2.2504.01' into release/个税&业务线	2026-02-10 16:57:04 +08:00
钱涛	e9719bd012	Merge branch 'release/个税版本' into release/个税&业务线	2026-02-10 16:56:59 +08:00
钱涛	e47d9eda1e	Merge branch 'release/2.19.1.2501.01' into release/个税版本	2026-02-10 16:54:02 +08:00
钱涛	50c84eb11e	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2026-02-05 15:03:49 +08:00
钱涛	49738114fc	薪资档案初始化导入支持	2026-02-05 15:03:31 +08:00