Merge remote-tracking branch 'origin/dev' into dev

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

@@ -57,11 +57,14 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             textbookClassRelation.setTextbookId(textbook.getId());
             textbookTextbookClassRelationMapper.insert(textbookClassRelation);
         }
-        for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
-            textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
-            textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+        if(textbook.getTextbookSubscriptionRecordList() != null){
+            for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
+                textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
+                textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+            }
         }
 
+
         return true;
     }