Merge branch 'fixbug/applet' into 'master'

bug: [none] bookId匹配失败则返回全部

See merge request rays/pcloud-book!949

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

@@ -151,15 +151,14 @@ public class WeworkTeacherBizImpl implements WeworkTeacherBiz {
     public List<WeworkTeacherVO> queryAll(Long bookId) {
         if (Objects.nonNull(bookId)){
             WeworkTeacherBookBind bind = weworkTeacherBookBindMapper.getByBookId(bookId);
-            if (Objects.isNull(bind) || StrUtil.isBlank(bind.getWeworkTeacherArr())){
-                return new ArrayList<>();
-            }
+            if (Objects.nonNull(bind) && StrUtil.isNotBlank(bind.getWeworkTeacherArr())){
                 List<Long> longs = JSONObject.parseArray(bind.getWeworkTeacherArr(), Long.class);
                 if (CollUtil.isEmpty(longs)){
                     return new ArrayList<>();
                 }
                 return weworkTeacherMapper.getMaterialByIds(longs);
             }
+        }
         return weworkTeacherMapper.queryAll();
     }