|
@@ -1290,10 +1290,13 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
}
|
|
|
|
|
|
//赋值归属公司
|
|
|
- SysDept company = deptService.getById(result.getCompanyId());
|
|
|
- if (ObjectUtil.isNotEmpty(company)) {
|
|
|
- result.setCompanyName(company.getDeptName());
|
|
|
- }
|
|
|
+ List<SysDept> companyList = deptService.list();
|
|
|
+ Map<Long, String> companyMap = companyList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
|
|
|
+
|
|
|
+ result.setCompanyName(companyMap.get(result.getCompanyId()));
|
|
|
+ result.setOfCompanyName(companyMap.get(result.getOfCompanyId()));
|
|
|
+ result.setDeptName(companyMap.get(result.getDeptId()));
|
|
|
+
|
|
|
|
|
|
return result;
|
|
|
}
|