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

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