申报修改

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

@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 									+ CommonConstants.DOWN_LINE_STRING
 									+ infoVo.getProvidentCreateMonth().trim()
 									+ CommonConstants.DOWN_LINE_STRING
-									+ Math.round(BigDecimalUtils.safeAdd(infoVo.getProvidentSum()).doubleValue() * 100) / 100.0);
+									+ Math.round(BigDecimalUtils.safeAdd(infoVo.getUnitProvidentSum()).doubleValue() * 100) / 100.0);
 						}
 						//存在公积金缴费数据
-						if (null != paymentInfo && ((BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) != 0)
-								|| ((BigDecimalUtils.isNullToZero(paymentInfo.getSocialSum()).compareTo(BigDecimal.ZERO) == 0)
-								&& BigDecimalUtils.isNullToZero(paymentInfo.getProvidentSum()).compareTo(BigDecimal.ZERO) == 0))) {
+						if (null != paymentInfo && BigDecimalUtils.isNullToZero(paymentInfo.getUnitProvidentSum()).compareTo(BigDecimal.ZERO) != 0) {
 
 							//允许覆盖，但已核准表或工资结算或已锁定不允许覆盖
 							errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" +