Ver Fonte

checkEmpty

deason há 6 anos atrás
pai
commit
125c2001c2

+ 2 - 2
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/CommonUtils.java

@@ -795,8 +795,8 @@ public final class CommonUtils {
      * @return
      */
     public static String parseHtml(String html) {
-        if (html == null) {
-            return null;
+        if (StringUtils.isEmpty(html)) {
+            return "";
         }
         org.jsoup.nodes.Document document = Jsoup.parse(html);
         return document.text();

+ 16 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -500,6 +500,10 @@ public abstract class ExportPaperAbstractService {
      * 4.替换题干中的##为____
      */
     public void setQuestionNumberForWord(List<PaperDetailExp> paperDetails) throws Exception {
+        if (CollectionUtils.isEmpty(paperDetails)) {
+            return;
+        }
+
         for (PaperDetailExp paperDetail : paperDetails) {
             List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
             for (PaperDetailUnitExp paperDetailUnit : paperDetailUnitExpList) {
@@ -1488,6 +1492,10 @@ public abstract class ExportPaperAbstractService {
      * 对相同类型的大题分组,生成不同的集合放入小题,再对小题排序
      */
     public void sortPaperDetailUnits(List<PaperDetailExp> details) {
+        if (CollectionUtils.isEmpty(details)) {
+            return;
+        }
+
         int index = 0;
         Map<Long, List<PaperDetailUnitExp>> map = new HashMap<>();
 
@@ -1551,6 +1559,10 @@ public abstract class ExportPaperAbstractService {
      * 如果每个小题分数不一致,题干后面添加分数;一致时则不用加
      */
     public void setQuestionScoreForHtml(List<PaperDetailExp> details) {
+        if (CollectionUtils.isEmpty(details)) {
+            return;
+        }
+
         for (PaperDetailExp detail : details) {
             if (checkPaperDetailUnitScore(detail) != null) {
                 continue;//分数一致
@@ -1611,6 +1623,10 @@ public abstract class ExportPaperAbstractService {
      * 4.替换题干中的##为____
      */
     public void setQuestionNumberForHtml(List<PaperDetailExp> details) {
+        if (CollectionUtils.isEmpty(details)) {
+            return;
+        }
+
         for (PaperDetailExp detail : details) {
             List<PaperDetailUnitExp> units = detail.getPaperDetailUnits();
             for (PaperDetailUnitExp unit : units) {