Quellcode durchsuchen

fix: 领包记录in null

lixuesong vor 2 Jahren
Ursprung
Commit
22273b40d7

+ 7 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1817,12 +1817,14 @@ public class ApiController {
 				Set<String> scorePackageIds = scorePackageList.stream()
 						.filter(output -> PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(output.getPackageType1()))
 						.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
-				List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
-						.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
 				Map<String, List<WmScorePackageSettleNote>> settelMap = new HashMap<>();
-				if (CollUtil.isNotEmpty(settleNotes)) {
-					settelMap = settleNotes.stream()
-							.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
+				if (CollUtil.isNotEmpty(scorePackageIds)) {
+					List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+							.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
+					if (CollUtil.isNotEmpty(settleNotes)) {
+						settelMap = settleNotes.stream()
+								.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
+					}
 				}
 //				Map<String, Object> map = new HashMap<>();
 				for (WmScorePackageApiOutput item : scorePackageList) {