bugfixed

CeDo

2021-06-08 368722058de0bfc15ced3fafdb6838686844ebe5

 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());
@@ -1581,10 +1581,11 @@
                Integer community_process = eventDO.getCommunityProcess() != null ? eventDO.getCommunityProcess() : -1;

                Integer eventDealStatus = -1;
                if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
                /*if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
                    eventDealStatus = 7;
                    //7已失效
                } else if (event_status == 1) {
                }*/
                if (event_status == 1) {
                    eventDealStatus = 5;
                    //"草稿箱"
                } else if (event_status == 4) {