From 3cd4159326af710c30b3c4ffe19e05d80ee1f405 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期四, 17 四月 2025 10:39:59 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 2 +-
zy-acs-flow/src/page/segment/SegmentList.jsx | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index 1bce14c..4d57b2f 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -33,6 +33,7 @@
FunctionField,
Count,
useNotify,
+ useRefresh,
} from 'react-admin';
import { Box, Typography, Stack, useMediaQuery, Tabs, Tab, Divider } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -144,7 +145,8 @@
const TabbedDatagrid = () => {
const translate = useTranslate();
- const notify = useNotify();
+ const notify = useNotify();
+ const refresh = useRefresh();
const { filterValues, setFilters, displayedFilters } = useListContext();
const isXSmall = useMediaQuery(theme =>
theme.breakpoints.down('sm')
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index 5bcc372..58cafeb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -131,7 +131,7 @@
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
- (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) || !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
+ (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
throw new CoolException("the task is not finish");
}
seg.setState(SegmentStateType.FINISH.toString());
--
Gitblit v1.9.1