Merge branch 'hzk' into 'master'

先删除后修改

See merge request rays/pcloud-book!30

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

@@ -191,17 +191,17 @@ public class BookClockBizImpl implements BookClockBiz {
                 throw new BookBizException(BookBizException.ERROR,"参数有误！");
             }
             //修改社群书
+            //删除关联的旧的社群书
+            bookGroupClockDao.deleteBookGroupId4AppType(paramMap);
             if(!ListUtils.isEmpty(bookGroupIdList)){
-                //删除关联的旧的社群书
-                bookGroupClockDao.deleteBookGroupId4AppType(paramMap);
                 List<BookGroupClock> list4BookGroupIds = bookGroupClockSet.setData4BookGroupClock(bookClockInfo, true, bookGroupIdList);
                 bookGroupClockList.addAll(list4BookGroupIds);
                 //获取社群书下面的所有分类
                 classifyIdsUnderBookGroup = bookGroupClassifyDao.getIdByBookGroupIds(bookGroupIdList);
             }
             //修改关联的分类
+            bookGroupClockDao.deleteClassifyId4AppType(paramMap);
             if(!ListUtils.isEmpty(classifyIdList)){
-                bookGroupClockDao.deleteClassifyId4AppType(paramMap);
                 if(!ListUtils.isEmpty(classifyIdsUnderBookGroup)){
                     classifyIdList.removeAll(classifyIdsUnderBookGroup);
                 }