Commit 2c8763a3 authored by hongguangwu's avatar hongguangwu

判空

parent cd0a038d
......@@ -1853,7 +1853,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
continue;
}
//起缴月份在要生成的月份后不处理 || 截止月份在要生成的月份后不处理
if (Integer.parseInt(payMonth) < DateUtil.formatDateInt(providentFund.getProvidentStart())
if (Common.isNotNull(providentFund.getProvidentStart())
&& Integer.parseInt(payMonth) < DateUtil.formatDateInt(providentFund.getProvidentStart())
|| (Common.isNotNull(providentFund.getFundReduceDate())
&& Integer.parseInt(payMonth) > DateUtil.formatDateInt(providentFund.getFundReduceDate()))) {
continue;
......
......@@ -891,7 +891,7 @@
<include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a
<where>
1=1
a.SOCIAL_ID is not null
<if test="empIdCard != null">
and a.EMP_IDCARD = #{empIdCard}
</if>
......@@ -909,7 +909,7 @@
<include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a
<where>
1=1
a.FUND_ID is not null
<if test="empIdCard != null">
and a.EMP_IDCARD = #{empIdCard}
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment