Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -393,19 +393,17 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                                 int seq = atomicInteger.getAndIncrement();
                                 int mod = seq % examTaskDetail.getDrawCount();
                                 String tempPaperType = paperTypes.get(mod);
-                                BasicAttachment basicAttachment;
+                                BasicAttachment basicAttachment = createPdfUtil.examStudentHtml(cardContent, null, tempPaperType, examDetail, examDetailCourse, sysUser.getId(), studentCardPdfList, basicCardRule);;
                                 if (!stringBasicAttachmentMap.containsKey(tempPaperType)) {
-                                    basicAttachment = createPdfUtil.examStudentHtml(cardContent, null, tempPaperType, examDetail, examDetailCourse, sysUser.getId(), studentCardPdfList, basicCardRule);
                                     stringBasicAttachmentMap.put(tempPaperType, basicAttachment);
                                     JSONObject object = new JSONObject();
                                     object.put("name", tempPaperType);
                                     object.put("attachmentId", basicAttachment.getId());
                                     stuJsonArray.add(object);
-                                } else {
-                                    basicAttachment = stringBasicAttachmentMap.get(tempPaperType);
+
+                                    // 用不带条码的模板
+                                    basicAttachmentList.add(basicAttachment);
                                 }
-                                // 用不带条码的模板
-                                basicAttachmentList.add(basicAttachment);
                                 i++;
                             }
                         } else {