Merge branch 'master' of http://116.63.33.55/git/nasctools

nasc-system/src/main/java/com/nasc/custom/service/impl/NascMatterServiceImpl.java

@@ -160,7 +160,9 @@ public class NascMatterServiceImpl implements INascMatterService {
             long[] optionIds = preQuestionOptionList.stream().mapToLong(NascPreQuestionOption::getId).toArray();
             // 删除材料清单列表
             for (NascPreQuestionOption option : preQuestionOptionList) {
-                materialListMapper.deleteMaterialListByMaterialId(option.getMaterial().getId());
+                if (option.getMaterial() != null) {
+                    materialListMapper.deleteMaterialListByMaterialId(option.getMaterial().getId());
+                }
             }
             // 删除选项相关的材料信息
             materialMapper.deleteMaterialByOptionIds(optionIds);

nasc-system/src/main/java/com/nasc/custom/service/impl/NascQuestionServiceImpl.java

@@ -98,7 +98,9 @@ public class NascQuestionServiceImpl implements INascQuestionService {
         long[] optionIds = optionList.stream().mapToLong(NascPreQuestionOption::getId).toArray();
         // 删除材料清单信息
         for (NascPreQuestionOption option: optionList) {
-            materialListMapper.deleteMaterialListByMaterialId(option.getMaterial().getId());
+            if (option.getMaterial() != null) {
+                materialListMapper.deleteMaterialListByMaterialId(option.getMaterial().getId());
+            }
         }
         // 删除选项相关的材料信息
         materialMapper.deleteMaterialByOptionIds(optionIds);