Merge branch 'feat-1002623fix' into 'master'

修改

See merge request rays/pcloud-book!613

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java

@@ -2000,7 +2000,24 @@ public class BookBizImpl implements BookBiz {
             return new BookDto();
         }
         //	设置模板名字
-        bookSet.setTemplateName(bookDto);
+        List<Long> templetIds = new ArrayList<>();
+        if(bookDto.getTempletId()!=null) {
+            templetIds.add(bookDto.getTempletId());
+        }
+        if(bookDto.getSecondTempletId()!=null) {
+            templetIds.add(bookDto.getSecondTempletId());
+        }
+        Map<Long, AssistTempletDTO> assistTempletDTOMap = assistTempletConsr.mapByIds(templetIds);
+        Long secondTempletId = bookDto.getSecondTempletId();
+        Long templetId = bookDto.getTempletId();
+        if (secondTempletId!=null&&assistTempletDTOMap!=null) {
+            AssistTempletDTO templetDTO = assistTempletDTOMap.get(secondTempletId);
+            bookDto.setSecondTempletName(Optional.ofNullable(templetDTO).map(AssistTempletDTO::getTempletName).orElse(null));
+        }
+        if (templetId!=null&&assistTempletDTOMap!=null) {
+            AssistTempletDTO templetDTO = assistTempletDTOMap.get(templetId);
+            bookDto.setTempletName(Optional.ofNullable(templetDTO).map(AssistTempletDTO::getTempletName).orElse(null));
+        }
         return bookDto;
     }