fix: 结算单下载-结算渠道显示问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -430,19 +430,14 @@ public class WmPayOffController {
 		Map<String, List<WmScorePackageSettleNote>> settleNoteMap = settleNoteList.stream()
 				.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
 
-		SubjectLocation subjectLocation = settleNoteList.get(0).getSubjectLocation();
-		if (subjectLocation == null) {
-			throw new RuntimeException("结算渠道为空");
-		}
-
 		// 查询企业对应渠道的收款单位信息
-		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
-				.eq(SysDeptSub::getDeptId, deptId)
-				.eq(SysDeptSub::getSubjectLocation, subjectLocation)
-				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
-		if (queryDeptSub == null) {
-			throw new RuntimeException("结算渠道配置为空");
-		}
+//		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+//				.eq(SysDeptSub::getDeptId, deptId)
+//				.eq(SysDeptSub::getSubjectLocation, subjectLocation)
+//				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+//		if (queryDeptSub == null) {
+//			throw new RuntimeException("结算渠道配置为空");
+//		}
 
 		// 导出数据整合
 		// 积分包列表
@@ -466,7 +461,7 @@ public class WmPayOffController {
 			BigDecimal actualAmount = settleNotes.stream()
 					.map(WmScorePackageSettleNote::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			totalSettleAmount = totalSettleAmount.add(settleAmount);
-			packageDetail.setSubjectLocation(subjectLocation.getDescription());
+			packageDetail.setSubjectLocation(settleNotes.get(0).getSubjectLocation().getDescription());
 			packageDetail.setSettleAmount(String.valueOf(settleAmount));
 			packageDetail.setActualAmount(String.valueOf(actualAmount));
 			packageDetailList.add(packageDetail);