Merge branch 'fixbug/1034130' into 'master'

feat:[1007350]bug1034130

See merge request rays/pcloud-book!1601

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

@@ -403,6 +403,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     private Long updatePageBySceneId(UpdateResourcePageVO updateResourcePageVO){
         Long sceneId = updateResourcePageVO.getSceneId();
         ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
+        //互助和打卡导航加到图书服务中配置，由前端控制是否配置
+        if (null != updateResourcePageVO.getOpenRays()) {
+            this.updateResourcePageModel(resourcePage.getId(),updateResourcePageVO.getResourcePageModelList(),resourcePage.getCreateUser());
+        }
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
         QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
         if (null == resourcePage) {
@@ -470,8 +474,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             //删除小程序默认导航
             this.deleteAppletDefaultNavigation(resourcePage.getId());
         }
-        //互助和打卡导航加到图书服务中配置，由前端控制是否配置
-        this.updateResourcePageModel(resourcePage.getId(),updateResourcePageVO.getResourcePageModelList(),resourcePage.getCreateUser());
         Long resourcePageId = resourcePage.getId();
         ThreadPoolUtils.OTHER_THREAD_POOL.execute(()-> esBookAndAdviserBiz.updateBookAndAdviserToES(Collections.singletonList(resourcePageId)));
         //更新二维码是否一个资源配置
@@ -522,6 +524,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     private Long updatePageByBookGroupId(UpdateResourcePageVO updateResourcePageVO) {
         Long bookGroupId = updateResourcePageVO.getBookGroupId();
         ResourcePage resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
+        //互助和打卡导航加到图书服务中配置，由前端控制是否配置
+        if (null != updateResourcePageVO.getOpenRays()) {
+            this.updateResourcePageModel(resourcePage.getId(),updateResourcePageVO.getResourcePageModelList(),resourcePage.getCreateUser());
+        }
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
         BookGroupDTO dto = bookGroupDao.getDTOById(bookGroupId);
         if (null == resourcePage) {
@@ -580,8 +586,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             //删除小程序默认导航
             this.deleteAppletDefaultNavigation(resourcePage.getId());
         }
-        //互助和打卡导航加到图书服务中配置，由前端控制是否配置
-        this.updateResourcePageModel(resourcePage.getId(),updateResourcePageVO.getResourcePageModelList(),resourcePage.getCreateUser());
         Long resourcePageId = resourcePage.getId();
         ThreadPoolUtils.OTHER_THREAD_POOL.execute(()-> esBookAndAdviserBiz.updateBookAndAdviserToES(Collections.singletonList(resourcePageId)));
         //更新二维码是否一个资源配置