From 008182e62d19bff65673b0823ee0e6c53142817d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 20:25:21 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 c1abaf9..c81a158 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
@@ -531,10 +531,10 @@
if (eventDO == null) {
return R.fail("事件不存在");
}
- boolean canDealByUser = eventDO.getEventStatus() == 2 && eventDO.getEventProcessStatus() == 1;
+ boolean canDealByUser = (eventDO.getEventStatus() == 2||eventDO.getEventStatus()==4) && eventDO.getEventProcessStatus() == 1;
if (!canDealByUser) {
- if (eventDO.getEventStatus() != 2) {
- return R.fail("事件不是发布状态");
+ if (eventDO.getEventStatus() != 2 ) {
+ return R.fail("事件不是发布/待处理状态");
}
if (eventDO.getEventProcessStatus() != 1) {
return R.fail("事件不是待处理状态");
@@ -1511,7 +1511,7 @@
.orderByDesc(EventTransferRecordDO::getCreateAt)
);
EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
- if (list != null || list.size() > 0) {
+ if (list != null && list.size() > 0) {
EventTransferRecordDO lastRecord = list.get(0);
eventTransferRecordDO.setFromType(lastRecord.getToType());
eventTransferRecordDO.setFromId(lastRecord.getToId());
--
Gitblit v1.7.1