From fa1f6548b85c889c5bb58d0199bd76095998fd79 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 26 Jun 2025 17:42:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B7=B2=E9=AA=8C=E8=AF=81=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8D=E8=83=BD=E6=8E=A5=E7=AE=A1=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=8E=A5=E7=AE=A1=E6=8C=89=E9=92=AE=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1445047831068672]作业管理-已验证的作业不能接管，但是接管按钮没有隐藏 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1445047831068672 --- .../job/source/type/DeployJobSourceTypeHandler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java index d2203149..54f32fa3 100644 --- a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java +++ b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java @@ -21,10 +21,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.CollectionUtils; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthActionChecker; -import neatlogic.framework.autoexec.constvalue.AutoexecJobPhaseNodeFrom; -import neatlogic.framework.autoexec.constvalue.ExecMode; -import neatlogic.framework.autoexec.constvalue.JobNodeStatus; -import neatlogic.framework.autoexec.constvalue.JobPhaseStatus; +import neatlogic.framework.autoexec.constvalue.*; import neatlogic.framework.autoexec.dao.mapper.AutoexecJobMapper; import neatlogic.framework.autoexec.dto.AutoexecParamVo; import neatlogic.framework.autoexec.dto.ISqlNodeDetail; @@ -49,6 +46,8 @@ import neatlogic.framework.deploy.auth.BATCHDEPLOY_MODIFY; import neatlogic.framework.deploy.auth.DEPLOY_MODIFY; import neatlogic.framework.deploy.auth.core.DeployAppAuthChecker; import neatlogic.framework.deploy.constvalue.*; +import neatlogic.framework.deploy.constvalue.JobSource; +import neatlogic.framework.deploy.constvalue.JobSourceType; import neatlogic.framework.deploy.dto.app.*; import neatlogic.framework.deploy.dto.instance.DeployInstanceVersionVo; import neatlogic.framework.deploy.dto.job.DeployJobContentVo; @@ -652,7 +651,9 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase if (UserContext.get().getUserUuid().equals(jobVo.getExecUser())) { jobVo.setIsCanExecute(1); } else { - jobVo.setIsCanTakeOver(1); + if (!Objects.equals(JobStatus.CHECKED.getValue(), jobVo.getStatus())) { + jobVo.setIsCanTakeOver(1); + } } } } -- Gitee