Commit cb5a2739 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 1bdc5552 7af29fe5
...@@ -3,6 +3,11 @@ spring.ldap.username=cn=admin,dc=worfu,dc=com ...@@ -3,6 +3,11 @@ spring.ldap.username=cn=admin,dc=worfu,dc=com
spring.ldap.password=Yifu123ABC! spring.ldap.password=Yifu123ABC!
spring.ldap.base=dc=worfu,dc=com spring.ldap.base=dc=worfu,dc=com
#spring.ldap.urls=ldap://192.168.1.65:389
#spring.ldap.username=cn=admin,dc=worfu,dc=com
#spring.ldap.password=yifu123456!
#spring.ldap.base=dc=worfu,dc=com
#ldap\u6D4B\u8BD5\u73AF\u5883\u914D\u7F6E-hgw-2025-04-23 #ldap\u6D4B\u8BD5\u73AF\u5883\u914D\u7F6E-hgw-2025-04-23
#spring.ldap.urls=ldap://192.168.1.65:389 #spring.ldap.urls=ldap://192.168.1.65:389
#spring.ldap.password=yifu123456! #spring.ldap.password=yifu123456!
\ No newline at end of file
...@@ -5048,6 +5048,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5048,6 +5048,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//被替换人 //被替换人
one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda() one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
.eq(TInsuranceReplace::getToInsuranceDetailId, vo.getId()) .eq(TInsuranceReplace::getToInsuranceDetailId, vo.getId())
//huyc-代码优化,取替换状态为成功的那一条数据
.eq(TInsuranceReplace::getReplaceStatus, CommonConstants.ONE_INT)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(one).isPresent()) { if (Optional.ofNullable(one).isPresent()) {
byId = this.getById(one.getFromInsuranceDetailId()); byId = this.getById(one.getFromInsuranceDetailId());
...@@ -5067,6 +5069,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5067,6 +5069,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//替换人 //替换人
fromOne = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda() fromOne = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
.eq(TInsuranceReplace::getFromInsuranceDetailId, vo.getId()) .eq(TInsuranceReplace::getFromInsuranceDetailId, vo.getId())
//huyc-代码优化,取替换状态为成功的那一条数据
.eq(TInsuranceReplace::getReplaceStatus, CommonConstants.ONE_INT)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(fromOne).isPresent()) { if (Optional.ofNullable(fromOne).isPresent()) {
byId = this.getById(fromOne.getToInsuranceDetailId()); byId = this.getById(fromOne.getToInsuranceDetailId());
......
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