|
|
@@ -333,7 +333,9 @@ public class HlwCompanyAccountDetailServiceImpl extends ServiceImpl<HlwCompanyAc
|
|
|
subcontractorQueryWrapper.eq("company_id", hlwCompanyAccount.getCompanyId());
|
|
|
subcontractorQueryWrapper.eq("subcontractor_id", hlwCompanyAccount.getSubcontractorId());
|
|
|
HlwCompanySubcontractor hlwCompanySubcontractor = hlwCompanySubcontractorService.getOne(subcontractorQueryWrapper);
|
|
|
- map.put("serviceRate", hlwCompanySubcontractor.getServiceRate());
|
|
|
+ if (hlwCompanySubcontractor != null) {
|
|
|
+ map.put("serviceRate", hlwCompanySubcontractor.getServiceRate());
|
|
|
+ }
|
|
|
//付款单
|
|
|
QueryWrapper<HlwPayment> paymentQueryWrapper = new QueryWrapper<>();
|
|
|
paymentQueryWrapper.eq("application_id", hlwCompanyAccount.getApplicationId());
|
|
|
@@ -355,7 +357,9 @@ public class HlwCompanyAccountDetailServiceImpl extends ServiceImpl<HlwCompanyAc
|
|
|
subcontractorQueryWrapper.eq("company_id", hlwCompanyAccount.getCompanyId());
|
|
|
subcontractorQueryWrapper.eq("cp_id", hlwCompanyAccount.getSubcontractorId());
|
|
|
HlwCompanyCp hlwCompanyCp = hlwCompanyCpService.getOne(subcontractorQueryWrapper);
|
|
|
- map.put("serviceRate", hlwCompanyCp.getServiceRate());
|
|
|
+ if (hlwCompanyCp != null) {
|
|
|
+ map.put("serviceRate", hlwCompanyCp.getServiceRate());
|
|
|
+ }
|
|
|
//付款单
|
|
|
QueryWrapper<HlwPayment> paymentQueryWrapper = new QueryWrapper<>();
|
|
|
paymentQueryWrapper.eq("application_id", hlwCompanyAccount.getApplicationId());
|