|
@@ -83,7 +83,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
|
|
|
}
|
|
|
}
|
|
|
Map<String, String> userMap = new HashMap<>();
|
|
|
- if (!Check.isNull(userIdMap)) {
|
|
|
+ if (!Check.isNullMap(userIdMap)) {
|
|
|
List<JSONObject> userList = userService.getUserMapByMap(userIdMap);
|
|
|
if (!Check.isNull(userList)) {
|
|
|
for (int i = 0; i < userList.size(); i++) {
|
|
@@ -93,7 +93,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
|
|
|
}
|
|
|
}
|
|
|
Map<String, String> advertiserMap = new HashMap<>();
|
|
|
- if (!Check.isNull(advertiserIdMap)) {
|
|
|
+ if (!Check.isNullMap(advertiserIdMap)) {
|
|
|
List<JSONObject> advertiserList = advertiserService.getAdvertiserByMap(advertiserIdMap);
|
|
|
if (!Check.isNull(advertiserList)) {
|
|
|
for (int i = 0; i < advertiserList.size(); i++) {
|
|
@@ -103,7 +103,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
|
|
|
}
|
|
|
}
|
|
|
Map<Long, String> productMap = new HashMap<>();
|
|
|
- if (!Check.isNull(productIdMap)) {
|
|
|
+ if (!Check.isNullMap(productIdMap)) {
|
|
|
List<JSONObject> productList = productService.getProductByMap(productIdMap);
|
|
|
if (!Check.isNull(productList)) {
|
|
|
for (int i = 0; i < productList.size(); i++) {
|
|
@@ -113,7 +113,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
|
|
|
}
|
|
|
}
|
|
|
Map<Long, Integer> transferMap = new HashMap<>();
|
|
|
- if (!Check.isNull(projectIdMap)) {
|
|
|
+ if (!Check.isNullMap(projectIdMap)) {
|
|
|
List<JSONObject> transferList = transferAccountMapper.getListByMap(projectIdMap);
|
|
|
if (!Check.isNull(transferList)) {
|
|
|
for (int i = 0; i < transferList.size(); i++) {
|
|
@@ -124,21 +124,21 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
|
|
|
}
|
|
|
|
|
|
for (Project project : records) {
|
|
|
- if (!Check.isNull(advertiserMap)) {
|
|
|
+ if (!Check.isNullMap(advertiserMap)) {
|
|
|
project.setAdvertiserId_dictText(advertiserMap.get(project.getAdvertiserId()));
|
|
|
}
|
|
|
- if (!Check.isNull(userMap)) {
|
|
|
+ if (!Check.isNullMap(userMap)) {
|
|
|
project.setResponsibleId_dictText(userMap.get(project.getResponsibleId()));
|
|
|
project.setDesignResponsibleId_dictText(userMap.get(project.getDesignResponsibleId()));
|
|
|
project.setSaleId_dictText(userMap.get(project.getSaleId()));
|
|
|
}
|
|
|
- if (!Check.isNull(productMap)) {
|
|
|
+ if (!Check.isNullMap(productMap)) {
|
|
|
project.setProductId_dictText(productMap.get(project.getProductId()));
|
|
|
}
|
|
|
- if (!Check.isNull(transferMap)) {
|
|
|
+ if (!Check.isNullMap(transferMap)) {
|
|
|
project.setNeedExamine(transferMap.get(project.getId()));
|
|
|
}
|
|
|
- if (!Check.isNull(supplierMap)) {
|
|
|
+ if (!Check.isNullMap(supplierMap)) {
|
|
|
project.setSupplierCode_dictText(supplierMap.get(project.getSupplierCode()));
|
|
|
}
|
|
|
}
|