教材管理-详情-征订记录查询bug修改

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

@@ -224,7 +224,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     public List<TextbookSubscriptionRecordVo> subscriptionList(Long id) {
         List<TextbookSubscriptionRecordVo> recordVos = textbookTextbookMapper.subscriptionList(id);
         for (TextbookSubscriptionRecordVo recordVo : recordVos) {
-            if(StrUtil.isEmpty(recordVo.getClassIds())){
+            if(ObjectUtil.isNull(recordVo) || StrUtil.isEmpty(recordVo.getClassIds())){
                 continue;
             }
             String[] split = recordVo.getClassIds().split(",");

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -39,16 +39,16 @@
     </select>
 
     <select id="subscriptionList" resultType="com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo">
-        SELECT t2.create_date,t4.name AS applicant_user,t2.issn,t2.book_name,t2.publishing_house,
-        t2.editor_in_chief,t2.appraisal_price,t5.name AS is_textbook_plan_cn,t6.name AS course_name,
-        t2.student_subscription_number,t2.teacher_subscription_number,t2.teacher_reference_number,
-        t7.name AS is_support_resources_cn,t2.version, t2.class_ids FROM textbook_subscription_record t1
-        LEFT JOIN wf_textbook_subscription_item t2 ON t1.wf_textbook_subscription_id = t2.id
-        LEFT JOIN wf_textbook_subscription t3 ON t2.wf_textbook_subscription_id = t3.id
-        LEFT JOIN xjr_user t4 ON t3.applicant_user_id = t4.id
-        LEFT JOIN xjr_dictionary_detail t5 ON t2.is_textbook_plan = t5.code AND t5.item_id = 1737360269850038273
-        LEFT JOIN base_course_subject t6 ON t2.course_subject_id = t6.id
-        LEFT JOIN xjr_dictionary_detail t7 ON t2.is_support_resources = t7.code AND t7.item_id = 1737360269850038273
+        SELECT t2.create_date,t4.name AS applicant_user,t3.issn,t3.book_name,t3.publishing_house,
+        t3.editor_in_chief,t3.appraisal_price,t5.name AS is_textbook_plan_cn,t6.name AS course_name,
+        t3.student_subscription_number,t3.teacher_subscription_number,t3.teacher_reference_number,
+        t7.name AS is_support_resources_cn,t3.version, t3.class_ids FROM textbook_subscription_record t1
+        LEFT JOIN wf_textbook_subscription t2 ON t1.wf_textbook_subscription_id = t2.id
+        LEFT JOIN wf_textbook_subscription_item t3 ON t3.wf_textbook_subscription_id = t2.id
+        LEFT JOIN xjr_user t4 ON t2.applicant_user_id = t4.id
+        LEFT JOIN xjr_dictionary_detail t5 ON t3.is_textbook_plan = t5.code AND t5.item_id = 1737360269850038273
+        LEFT JOIN base_course_subject t6 ON t3.course_subject_id = t6.id
+        LEFT JOIN xjr_dictionary_detail t7 ON t3.is_support_resources = t7.code AND t7.item_id = 1737360269850038273
         WHERE t1.delete_mark = 0 AND t1.textbook_id = #{id}
     </select>