From fbeca6637b66bae2e97a2eeba67bf911fb9002af Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 09:13:51 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 4fe732e..d21898e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -647,9 +647,9 @@
@Override
public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
- boolean canRepublishByUser = eventDO.getEventStatus()==4;
+ boolean canRepublishByUser = eventDO.getEventStatus()==4||eventDO.getEventStatus()==1;
if(!canRepublishByUser){
- return R.fail("当前不是撤销状态");
+ return R.fail("当前不是撤销/草稿状态");
}
eventDO.setEventStatus(2);//2 发布
--
Gitblit v1.7.1