Commit a64f9384 authored by wangzb's avatar wangzb

feature-wzb :bug修复

parent b689e6a6
...@@ -1245,7 +1245,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1245,7 +1245,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TSocialFundInfo sf = new TSocialFundInfo(); TSocialFundInfo sf = new TSocialFundInfo();
sf.setEmpIdcard(insert.getEmpIdcard()); sf.setEmpIdcard(insert.getEmpIdcard());
sf.setSettleDomain(insert.getSettleDomain()); sf.setSettleDomain(insert.getSettleDomain());
if (!CommonConstants.ONE_STRING.equals(insert.getSituation()) && !CommonConstants.TWO_STRING.equals(insert.getSituation()) && !CommonConstants.THREE_STRING.equals(insert.getSituation()) &&!CommonConstants.FOUR_STRING.equals(insert.getSituation())) { if (!("合同未到期重新签订").equals(insert.getSituation())&&!("正常续签").equals(insert.getSituation())
&&!("离职再入职").equals(insert.getSituation()) &&!("商务合同更改").equals(insert.getSituation())) {
R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN); , "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN);
if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) { if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) {
...@@ -1254,7 +1255,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1254,7 +1255,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} }
} }
}
}
} }
/** /**
......
...@@ -49,5 +49,4 @@ spring: ...@@ -49,5 +49,4 @@ spring:
on-profile: dev on-profile: dev
redis: redis:
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: '@yf_2017' \ No newline at end of file
\ No newline at end of file
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