薪资人员列表 查询 详情 导出

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -722,9 +722,16 @@
 		t_employee_contract_info x
 		WHERE
 		x.DELETE_FLAG = '0'
-		AND x.AUDIT_STATUS != '3'
-		AND x.IS_OBSOLETE = '0'
+		AND (
+		(
+		x.AUDIT_STATUS = '2'
 		AND x.IN_USE = '0'
+		)
+		OR (
+		x.AUDIT_STATUS = '1'
+		AND x.IN_USE = '1'
+		)
+		)
 		<if test="checkVo != null">
 			<if test="checkVo.idCards != null">
 				AND x.EMP_IDCARD in

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

@@ -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;