Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -198,10 +198,14 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 //根据questionCode查询问题类型表出对应的id值
                 QuestionType questionTypeData = null;
                 if (StringUtils.isNotEmpty(questionFile.getQuestionCode())) {
-                    questionTypeData= questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
+                    questionTypeData = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
                             .eq(QuestionType::getCode, questionFile.getQuestionCode())
-                            .eq(QuestionType::getMark, 1));
-                    inspectionFile.setQuestionId(questionTypeData.getId());
+                            .eq(QuestionType::getMark, MarkEnum.VALID.getCode()));
+                    if (ObjectUtil.isNotEmpty(questionTypeData)) {
+                        inspectionFile.setQuestionId(questionTypeData.getId());
+                    } else {
+                        log.error("该问题类型在业务平台不存在，code={}", questionFile.getQuestionCode());
+                    }
                 }
                 // 问题名称
                 inspectionFile.setQuestionName(questionFile.getQuestionName());