diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java
index 599376be..57b104c4 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperQuestionRelServiceImpl.java
@@ -20,6 +20,7 @@ import org.qinan.cedu.model.entity.PaperQuestionRelDO;
 import org.qinan.cedu.model.entity.QuestionDO;
 import org.qinan.cedu.model.entity.QuestionOptionDO;
 import org.qinan.cedu.service.PaperQuestionRelService;
+import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -81,9 +82,7 @@ public class PaperQuestionRelServiceImpl extends ServiceImpl<PaperQuestionRelMap
                 .map(option -> String.valueOf(option.getId()))
                 .collect(Collectors.joining(",")));
 
-        question.setCreateTime(now);
-        question.setUpdateTime(now);
-        question.setVersion(0);
+        InsertFieldDefaults.applyIgnoreOrgId(question);
         questionMapper.insert(question);
         Db.saveBatch(options);
 
@@ -91,8 +90,7 @@ public class PaperQuestionRelServiceImpl extends ServiceImpl<PaperQuestionRelMap
         PaperQuestionRelDO rel = new PaperQuestionRelDO();
         rel.setPaperId(dto.getPaperId());
         rel.setQuestionId(question.getId());
-        rel.setCreateTime(now);
-        rel.setUpdateTime(now);
+        InsertFieldDefaults.applyIgnoreOrgId(rel);
         this.save(rel);
     }
 
@@ -114,9 +112,7 @@ public class PaperQuestionRelServiceImpl extends ServiceImpl<PaperQuestionRelMap
             option.setOptionKey(key);
             option.setOptionName(key);
             option.setSortOrder(sortOrder++);
-            option.setCreateTime(now);
-            option.setUpdateTime(now);
-            option.setVersion(0);
+            InsertFieldDefaults.applyIgnoreOrgId(option);
         }
         return options;
     }
diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/QuestionServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/QuestionServiceImpl.java
index ffe06299..178aa5d5 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/QuestionServiceImpl.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/QuestionServiceImpl.java
@@ -54,7 +54,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, QuestionDO>
     public QuestionVO find(Long questionId) {
         QuestionVO questionVO = this.baseMapper.findQuestion(questionId);
         if (questionVO == null) {
-            throw new IllegalArgumentException("试题不存在：id=" + questionId);
+            throw new IllegalArgumentException("试题不存在");
         }
         // 查询选项信息（仅查询VO需要的字段）
         List<QuestionOptionDO> options = questionOptionService.lambdaQuery()
diff --git a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
index f408f370..7e535324 100644
--- a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
+++ b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
@@ -27,7 +27,7 @@
         , q.analysis, q.tag_type, q.courseware_management_id
         , cm.courseware_name AS coursewareManagementName
         FROM question q
-        JOIN courseware_management cm ON q.courseware_management_id = cm.id
+        LEFT JOIN courseware_management cm ON q.courseware_management_id = cm.id
         WHERE q.id = #{questionId}
         AND q.delete_enum = 'false'
     </select>