Merge branch '20221101' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -486,11 +486,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         Integer userId = subjectChange.getStudentId();
         
         //乐器已发货，不能做声部更换
-		List<StudentPaymentOrderDetail> originalStudentPaymentOrderDetailList = studentPaymentOrderDetailDao.findUserApplyOrder(userId, musicGroupId,
-				DealStatusEnum.SUCCESS);
-		originalStudentPaymentOrderDetailList = originalStudentPaymentOrderDetailList.stream().filter(t -> StringUtils.isNotBlank(t.getDeliveryBatchNo()))
-				.collect(Collectors.toList());
-		if (originalStudentPaymentOrderDetailList != null && originalStudentPaymentOrderDetailList.size() > 0) {
+		List<StudentPaymentOrderDetail> spodList = studentPaymentOrderDetailDao.findUserApplyOrder(userId, musicGroupId, DealStatusEnum.SUCCESS);
+		spodList = spodList.stream().filter(t -> StringUtils.isNotBlank(t.getDeliveryBatchNo())).collect(Collectors.toList());
+		if (spodList != null && spodList.size() > 0) {
 			throw new BizException("当前学生乐器已发货，不能做声部更改");
 		}