修改bug 征订编辑时回显的定价错误

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookSubscriptionServiceImpl.java

@@ -212,11 +212,16 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
     @Override
     public TextbookSubscriptionVo infoRubAndHand(Long id) {
         TextbookSubscription textbookSubscription = this.getById(id);
+        if(ObjectUtils.isEmpty(textbookSubscription)){
+            throw new MyException("当前征订已被修改，请刷新重试");
+        }
+
         TextbookSubscriptionVo textbookSubscriptionVo = BeanUtil.toBean(textbookSubscription, TextbookSubscriptionVo.class);
 
         MPJLambdaWrapper<TextbookSubscriptionItem> textbookSubscriptionItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
         textbookSubscriptionItemMPJLambdaWrapper
                 .select(TextbookSubscriptionItem::getId)
+                .selectAs(Textbook::getPrice, TextbookSubscriptionItemVo::getPrice)
                 .select(TextbookSubscriptionItem.class,x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionItemVo.class).contains(x.getProperty()))
                 .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId,
                         wrapper -> wrapper
@@ -231,12 +236,14 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                                 )
                 )
                 .selectAs(TextbookSubscriptionItem::getPrice, TextbookSubscriptionItemVo::getPricing)
-                .selectAs(Textbook::getPrice, TextbookSubscriptionItemVo::getPrice)
                 .eq(TextbookSubscriptionItem::getTextbookSubscriptionId, id)
         ;
         List<TextbookSubscriptionItemVo> list = textbookSubscriptionTextbookSubscriptionItemMapper.selectJoinList(TextbookSubscriptionItemVo.class, textbookSubscriptionItemMPJLambdaWrapper);
 
-        textbookSubscriptionVo.setTextbookSubscriptionItemList(list);
+        if(ObjectUtils.isNotEmpty(list)){
+            textbookSubscriptionVo.setTextbookSubscriptionItemList(list);
+        }
+
         return textbookSubscriptionVo;
     }