From 19ff0e7493177a6593f05b0cbb615bf2f92f1d5c Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 9 Oct 2024 17:54:57 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E9=87=8A=E7=96=91=E5=BA=93=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...RegulationsQuestionLibraryServiceImpl.java | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
index 54785399..fc8807ab 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
@@ -167,21 +167,23 @@ public class LawsRegulationsQuestionLibraryServiceImpl extends ServiceImpl<LawsR
                 String regulationId1 = regulationIdList.get(i);
                 String number = regulationNumberList.get(i);
                 LawsDocumentSplit lawsDocumentSplit = documentSplitMapper.selectById(regulationId1);
-                regulationVo.setId(regulationId1);
-                regulationVo.setItemNum(lawsDocumentSplit.getItemNum());
-                regulationVo.setItemTitle(lawsDocumentSplit.getItemTitle());
-                regulationVo.setTitleTranslation(lawsDocumentSplit.getTitleTranslation());
-                regulationVo.setItemContent(lawsDocumentSplit.getItemContent());
-                regulationVo.setTranslation(lawsDocumentSplit.getTranslation());
-                // 找到最后一个空格的位置
-                int lastSpaceIndex = number.lastIndexOf(" ");
-                // 确保空格存在并且位置不在字符串的开始或结束
-                if (lastSpaceIndex != -1 && lastSpaceIndex < number.length() - 1) {
-                    String key = number.substring(0, lastSpaceIndex);
-                    regulationVo.setStandardNumber(key);
-                    regulationVo.setStandardId(standardNumberMap.get(key));
+                if (!Objects.isNull(lawsDocumentSplit)) {
+                    regulationVo.setId(regulationId1);
+                    regulationVo.setItemNum(lawsDocumentSplit.getItemNum());
+                    regulationVo.setItemTitle(lawsDocumentSplit.getItemTitle());
+                    regulationVo.setTitleTranslation(lawsDocumentSplit.getTitleTranslation());
+                    regulationVo.setItemContent(lawsDocumentSplit.getItemContent());
+                    regulationVo.setTranslation(lawsDocumentSplit.getTranslation());
+                    // 找到最后一个空格的位置
+                    int lastSpaceIndex = number.lastIndexOf(" ");
+                    // 确保空格存在并且位置不在字符串的开始或结束
+                    if (lastSpaceIndex != -1 && lastSpaceIndex < number.length() - 1) {
+                        String key = number.substring(0, lastSpaceIndex);
+                        regulationVo.setStandardNumber(key);
+                        regulationVo.setStandardId(standardNumberMap.get(key));
+                    }
+                    regulationList.add(regulationVo);
                 }
-                regulationList.add(regulationVo);
             }
             lawsRegulationsQuestionLibrary.setRegulationList(regulationList);
         }