薪资更新

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -542,13 +542,17 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 						account = new TSalaryAccount();
 						account.setId(sendParam.getFd_3b10af838eab5c());
 						// 社保
-						if (Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
-								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c())) {
+						if ((Common.isNotNull(sendParam.getUnitSocial())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitSocial()))
+							||(Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c()))) {
 							doSendForecastSocialToEkp(sendParam, s);
 						}
 						// 公积金
-						if (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
-								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a())) {
+						if ((Common.isNotNull(sendParam.getUnitFund())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitFund()))
+								|| (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a()))) {
 							doSendForecastFundToEkp(sendParam, s);
 						}
 						sendBack = ekpSalaryUtil.sendToEKP(salaryParam);