Merge branch 'fixbug/deleteColumn' into 'master'

bug:[none]保存空页面

See merge request rays/pcloud-book!1408

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

@@ -1257,6 +1257,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long resourcePageId = this.updateResourcePage(updateResourcePageVO);
         //当前所有栏目
         List<Long> originColumnIds = resourcePageColumnDao.getColumnIdsByPageId(resourcePageId);
+        //删除栏目资源
+        resourcePageItemDao.deleteByPageId(resourcePageId);
         if (!ListUtils.isEmpty(updateResourcePageVO.getColumnVOS())) {
             List<UpdateResourceColumnVO> list = updateResourcePageVO.getColumnVOS();
             List<Long> columnIds = new ArrayList<>();
@@ -1283,8 +1285,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                     throw new BookBizException(BookBizException.PARAM_IS_NULL, "弹窗式公众号只能配置一个");
                 }
             }
-            //栏目资源
-            resourcePageItemDao.deleteByPageId(resourcePageId);
             for (UpdateResourceColumnVO columnVO : list) {
                 this.updateResourceColumn(columnVO);
             }