sakuya преди 3 години
родител
ревизия
a65750c4f4
променени са 1 файла, в които са добавени 9 реда и са изтрити 4 реда
  1. 9 4
      eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankOrderServiceImpl.java

+ 9 - 4
eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankOrderServiceImpl.java

@@ -90,10 +90,15 @@ public class BankOrderServiceImpl implements BankOrderService {
 			volist = BeanCopyUtils.convertList2List(entiryList, BankOrderVO.class);
 		}
 		List<String> bizNoList = volist.stream().map(BankOrderVO::getBusinessNo).collect(Collectors.toList());
-		List<OrderFileEntity> fileList = orderFileRepository.canBeSignedNotarization(bizNoList);
-		Set<String> set = fileList.stream().map(OrderFileEntity::getBusinessNo).collect(Collectors.toSet());
-		for (BankOrderVO order : volist) {
-			order.setNotarizedFlag(set.contains(order.getBusinessNo()) ? "1" : "0");
+		if (bizNoList != null && bizNoList.size() > 0) {
+			Set<String> set = new HashSet<>();
+			List<OrderFileEntity> fileList = orderFileRepository.canBeSignedNotarization(bizNoList);
+			if (fileList != null && fileList.size() > 0) {
+				set = fileList.stream().map(OrderFileEntity::getBusinessNo).collect(Collectors.toSet());
+			}
+			for (BankOrderVO order : volist) {
+				order.setNotarizedFlag(set.contains(order.getBusinessNo()) ? "1" : "0");
+			}
 		}
 		return volist;
 	}