Skip to content

李苗 / Vion-DevOps

Go to a project
Commit f786ad1b by HlQ
Options

[fix] 新项目管理列表不显示项目经理 bug 修复

1 parent 251285ca
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/vion/service/impl/ContractServiceImpl.java
...@@ -113,6 +113,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -113,6 +113,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
.map(RContractUser::getUsername) .map(RContractUser::getUsername)
.ifPresent(vo::setSaleName))); .ifPresent(vo::setSaleName)));
completeStoreName(contractVOList.getRecords());
if (!result.roleCodeList.contains("admin") && !result.roleCodeList.contains("xiaoshou") && !result.roleCodeList.contains("caiwu")) { if (!result.roleCodeList.contains("admin") && !result.roleCodeList.contains("xiaoshou") && !result.roleCodeList.contains("caiwu")) {
contractVOList.getRecords().forEach(vo -> { contractVOList.getRecords().forEach(vo -> {
vo.setTotalAmount(null); vo.setTotalAmount(null);
...@@ -123,7 +124,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -123,7 +124,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
vo.setDiffAmount(null); vo.setDiffAmount(null);
}); });
} }
completeStoreName(contractVOList.getRecords());
return contractVOList; return contractVOList;
} }
...@@ -186,6 +186,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -186,6 +186,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
.map(RContractUser::getUsername) .map(RContractUser::getUsername)
.ifPresent(vo::setSaleName))); .ifPresent(vo::setSaleName)));
completeStoreName(contractVOList.getRecords());
contractVOList.getRecords().forEach(vo -> { contractVOList.getRecords().forEach(vo -> {
vo.setCustomerName(null); vo.setCustomerName(null);
vo.setTotalAmount(null); vo.setTotalAmount(null);
...@@ -201,7 +202,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -201,7 +202,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
storeVOList.forEach(storeVO -> storeVO.setMainUser(storeId2UserIdMap.getOrDefault(storeVO.getId(), null))); storeVOList.forEach(storeVO -> storeVO.setMainUser(storeId2UserIdMap.getOrDefault(storeVO.getId(), null)));
vo.setStoreVOS(storeVOList); vo.setStoreVOS(storeVOList);
}); });
completeStoreName(contractVOList.getRecords());
return contractVOList; return contractVOList;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!