From 6ef71d9dfe52cbc6fb020476ae2cb0ef6a44c3e4 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Sat, 12 Jun 2021 15:16:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3PC=E9=A1=B5=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=BC=80=E5=90=AF=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/serviceimpl/PageDataServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 9db2181d..60a14f62 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -51,10 +51,10 @@ public class PageDataServiceImpl extends ServiceImpl i @Override public PageData addPageData(PageData pageData) { //如果页面为发布，则关闭其他页面，开启此页面 - if(pageData.getPageShow().equals(SwitchEnum.OPEN.name())){ + if (pageData.getPageShow().equals(SwitchEnum.OPEN.name())) { LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); - lambdaUpdateWrapper.eq(PageData::getPageType,pageData.getPageType()); - lambdaUpdateWrapper.eq(PageData::getPageClientType,pageData.getPageClientType()); + lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType()); + lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType()); lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name()); this.update(lambdaUpdateWrapper); } @@ -65,12 +65,14 @@ public class PageDataServiceImpl extends ServiceImpl i @Override public PageData updatePageData(PageData pageData) { //如果页面为发布，则关闭其他页面，开启此页面 - if(pageData.getPageShow().equals(SwitchEnum.OPEN.name())){ + if (pageData.getPageShow() != null && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) { LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); - lambdaUpdateWrapper.eq(PageData::getPageType,pageData.getPageType()); - lambdaUpdateWrapper.eq(PageData::getPageClientType,pageData.getPageClientType()); + lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType()); + lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType()); lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name()); this.update(lambdaUpdateWrapper); + } else { + pageData.setPageShow(SwitchEnum.CLOSE.name()); } LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); lambdaUpdateWrapper.set(PageData::getPageData, pageData.getPageData());