Merge branch 'fixbug/1004570' into 'master'

bug:[1004570] fixNull

See merge request rays/pcloud-book!1254

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

@@ -476,7 +476,7 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
         List<Long> wxWorkTeacherIds = recordList.stream().filter(appletRecordDTO -> AppletRecordTypeEnum.WX_WORK_TEACHER.value.equals(appletRecordDTO.getRecordType())).
                 map(AppletRecordDTO::getFromId).distinct().collect(Collectors.toList());
         List<Long> bookIds = recordList.stream().filter(appletRecordDTO -> AppletRecordTypeEnum.PRODUCT.value.equals(appletRecordDTO.getRecordType()) || AppletRecordTypeEnum.APP.value.equals(appletRecordDTO.getRecordType()))
-                .map(AppletRecordDTO::getBookId).distinct().collect(Collectors.toList());
+                .map(AppletRecordDTO::getBookId).filter(e -> null != e).distinct().collect(Collectors.toList());
         Map<Long, BookDto> bookDtoMap;
         CompletableFuture<Map<Long, BookDto>> bookDtoMapFuture = null;
         if (CollUtil.isNotEmpty(bookIds)) {

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -338,7 +338,7 @@
 		WHERE
 			BOOK_ID IN 
 			<foreach collection="list" index="i" item="item" open="(" separator="," close=")">
-				${item}
+				#{item}
 			</foreach>
 	</select>