|
@@ -335,8 +335,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
|
|
|
wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
|
|
|
}
|
|
|
-
|
|
|
- wrapper.eq(Contract::getCompanyId, dto.getCompanyId());
|
|
|
+
|
|
|
+ wrapper.eq("t1", Contract::getCompanyId, dto.getCompanyId());
|
|
|
+
|
|
|
+ wrapper.eq("t1", Contract::getDeptId, dto.getDeptId());
|
|
|
|
|
|
if (StringUtils.isNotEmpty(dto.getKeyword())) {
|
|
|
List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
|
|
@@ -403,8 +405,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
return page;
|
|
|
}
|
|
|
-
|
|
|
- List<SysDept> companyList = deptService.list(Wrappers.<SysDept>query().eq("type", 0));
|
|
|
+
|
|
|
+ List<SysDept> companyList = deptService.list();
|
|
|
Map<Long, String> companyMap = companyList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
|
|
|
|
|
|
|
|
@@ -452,9 +454,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
|
|
|
p.setContractTypeVal(contractTypeStatusDic.get(p.getContractType()));
|
|
|
|
|
|
-
|
|
|
+
|
|
|
p.setCompanyName(companyMap.get(p.getCompanyId()));
|
|
|
|
|
|
+
|
|
|
+ p.setDeptName(companyMap.get(p.getDeptId()));
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|