3.0.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -854,8 +854,10 @@ public class CreatePdfUtil {
 
         // 根据题卡规则必选字段，替换相应值，没有则“”
         List<StudentExtendDto> studentExtendDtos = createExtendObject(examDetail, examStudent, basicCardRule);
-        for (StudentExtendDto extendDto : studentExtendDtos) {
-            studentHtml = studentHtml.replaceAll("\\$\\{" + extendDto.getFieldName() + "\\}", String.valueOf(extendDto.getValue()));
+        if(studentExtendDtos != null) {
+            for (StudentExtendDto extendDto : studentExtendDtos) {
+                studentHtml = studentHtml.replaceAll("\\$\\{" + extendDto.getFieldName() + "\\}", String.valueOf(extendDto.getValue()));
+            }
         }
         // 以下值通过createExtendObject动态设置了，暂时屏蔽（2022-03-11 by xf）
             /*
@@ -886,6 +888,9 @@ public class CreatePdfUtil {
      */
     private List<StudentExtendDto> createExtendObject(ExamDetail examDetail, ExamStudent examStudent, BasicCardRule basicCardRule) {
         ExamStudentPdfInfoDto examStudentPdfInfoDto = examStudent == null ? null : examStudentService.getByStudentId(examStudent.getId());
+        if(basicCardRule == null){
+            return null;
+        }
         List<JSONObject> requiredFieldsJson = JSONArray.parseArray(basicCardRule.getRequiredFields(), JSONObject.class);
         List<StudentExtendDto> studentExtendDtos = new ArrayList<>();
         if (requiredFieldsJson.size() > 0) {

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -123,6 +123,7 @@
         WHERE
             a.school_id = #{schoolId}
             AND a.type = #{type}
+            AND a.create_method != 'STANDARD'
             AND a.enable = TRUE
             <if test="orgIds != null">
                 AND c.org_id IN