fix 项目详情查询失败

This commit is contained in:
lijiarao
2024-07-30 11:02:58 +08:00
parent f626a33be6
commit ab96a990a6
2 changed files with 16 additions and 0 deletions
@@ -106,6 +106,14 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
temporary = JSON.parseObject(str, PayCompanyManagementTemporary.class); temporary = JSON.parseObject(str, PayCompanyManagementTemporary.class);
}else { }else {
temporary = this.getById(companyTemporaryId); temporary = this.getById(companyTemporaryId);
if (temporary == null){
PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
}
String str = JSONObject.toJSONString(payCompanyManagement);
temporary = JSON.parseObject(str, PayCompanyManagementTemporary.class);
}
} }
return temporary; return temporary;
} }
@@ -116,6 +124,9 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
temporary = baseMapper.selectById(id); temporary = baseMapper.selectById(id);
if (temporary == null){ if (temporary == null){
PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id); PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id);
if (payCompanyManagement == null){
return null;
}
if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){ if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK); payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
} }
@@ -93,6 +93,11 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
temporary = JSON.parseObject(str, PayContactsManagementTemporary.class); temporary = JSON.parseObject(str, PayContactsManagementTemporary.class);
}else { }else {
temporary = this.getById(contactsTemporaryId); temporary = this.getById(contactsTemporaryId);
if (temporary == null){
PayContactsManagement contactsManagement = payContactsManagementService.getById(contactsId);
String str = JSONObject.toJSONString(contactsManagement);
temporary = JSON.parseObject(str, PayContactsManagementTemporary.class);
}
} }
return temporary; return temporary;
} }