diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
index 43ed464df73bef607f0e33fe8520d8dbadb09777..8c7594b00880043d8f083f9ca356b5d1d5ff32b0 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
@@ -41,6 +41,8 @@ public interface AutoexecJobMapper {
 
     AutoexecJobVo getJobInfo(Long jobId);
 
+    AutoexecJobVo getJobInfoWithInvoke(Long jobId);
+
     List<AutoexecJobVo> getJobWarnCountAndStatus(List<Long> idList);
 
     List<AutoexecJobVo> getJobListByIdList(List<Long> idList);
diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
index 4c01b3de1f2f6b873a0d21668c5151033855bd4e..e5590e99ecf35b5695af71a27b15d4bfc136d0b8 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
@@ -689,6 +689,37 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE aj.`id` = #{value}
     </select>
 
+    <select id="getJobInfoWithInvoke" parameterType="java.lang.Long"
+            resultType="neatlogic.framework.autoexec.dto.job.AutoexecJobVo">
+        SELECT aj.`id`,
+               aj.`name`,
+               aj.`status`,
+               aj.`plan_start_time` as planStartTime,
+               aj.`start_time`      as startTime,
+               aj.`end_time`        as endTime,
+               aj.`operation_id`    as operationId,
+               aj.`operation_type`  as operationType,
+               aj.`exec_user`       as execUser,
+               aj.`exec_user_type`  as execUserType,
+               aj.`source`,
+               aj.`round_count`     as roundCount,
+               aj.`parallel_count`     as parallelCount,
+               aj.`parallel_policy`     as parallelPolicy,
+               aj.`param_hash`      as paramHash,
+               aj.`config_hash`     as configHash,
+               aj.`lncd`,
+               aj.`parent_id`       as parentId,
+               aj.`trigger_type`    as triggerType,
+               aj.`scenario_id`     as scenarioId,
+               aj.`runner_map_id`   as runnerMapId,
+               aji.invoke_id        as invokeId,
+               aji.source,
+               aji.type             as sourceType
+        FROM `autoexec_job` aj
+        left join `autoexec_job_invoke` aji on aj.id = aji.job_id
+        WHERE aj.`id` = #{value}
+    </select>
+
     <select id="checkIsJobUser" resultType="java.lang.Integer">
         select count(1)
         from `autoexec_job`
diff --git a/src/main/java/neatlogic/framework/autoexec/dto/job/AutoexecJobVo.java b/src/main/java/neatlogic/framework/autoexec/dto/job/AutoexecJobVo.java
index 1239e8f9b3cb31fc93dfebc3ad30dd21b4640a9f..bf1190219f950c9557e9b6ef58374d7f69e677c4 100644
--- a/src/main/java/neatlogic/framework/autoexec/dto/job/AutoexecJobVo.java
+++ b/src/main/java/neatlogic/framework/autoexec/dto/job/AutoexecJobVo.java
@@ -142,8 +142,6 @@ public class AutoexecJobVo extends BaseEditorVo implements Serializable {
     private Integer isCanTakeOver = 0;
     @EntityField(name = "是否拥有验证权限", type = ApiParamType.INTEGER)
     private Integer isCanCheck = 0;
-    @EntityField(name = "是否接管", type = ApiParamType.INTEGER)
-    private Integer isTakeOver = 0;
     @EntityField(name = "最近一次节点变动时间", type = ApiParamType.STRING)
     private Date lncd;
     @EntityField(name = "场景id", type = ApiParamType.LONG)
@@ -930,14 +928,6 @@ public class AutoexecJobVo extends BaseEditorVo implements Serializable {
         this.extraInfo = extraInfo;
     }
 
-    public Integer getIsTakeOver() {
-        return isTakeOver;
-    }
-
-    public void setIsTakeOver(Integer isTakeOver) {
-        this.isTakeOver = isTakeOver;
-    }
-
     public JSONObject getPassThroughEnv() {
         return passThroughEnv;
     }
@@ -954,14 +944,6 @@ public class AutoexecJobVo extends BaseEditorVo implements Serializable {
         this.isCanCheck = isCanCheck;
     }
 
-    public String getAssignExecUser() {
-        return assignExecUser;
-    }
-
-    public void setAssignExecUser(String assignExecUser) {
-        this.assignExecUser = assignExecUser;
-    }
-
     public Integer getWarnCount() {
         return warnCount;
     }
diff --git a/src/main/java/neatlogic/framework/autoexec/job/action/core/AutoexecJobActionHandlerBase.java b/src/main/java/neatlogic/framework/autoexec/job/action/core/AutoexecJobActionHandlerBase.java
index 57c352f8956e5edfb936e9d01e29ae92cba864a2..f5433406118d57f0d4c6500a6a73690b08c8fa55 100644
--- a/src/main/java/neatlogic/framework/autoexec/job/action/core/AutoexecJobActionHandlerBase.java
+++ b/src/main/java/neatlogic/framework/autoexec/job/action/core/AutoexecJobActionHandlerBase.java
@@ -20,7 +20,6 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthActionChecker;
 import neatlogic.framework.autoexec.auth.AUTOEXEC_SCRIPT_MODIFY;
 import neatlogic.framework.autoexec.constvalue.ExecMode;
-import neatlogic.framework.autoexec.constvalue.JobAction;
 import neatlogic.framework.autoexec.constvalue.JobSource;
 import neatlogic.framework.autoexec.constvalue.JobStatus;
 import neatlogic.framework.autoexec.dao.mapper.AutoexecCombopMapper;
@@ -45,7 +44,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -119,8 +117,7 @@ public abstract class AutoexecJobActionHandlerBase implements IAutoexecJobAction
                     throw new AutoexecJobSourceInvalidException(jobVo.getSource());
                 }
                 IAutoexecJobSourceTypeHandler autoexecJobSourceActionHandler = AutoexecJobSourceTypeHandlerFactory.getAction(jobSource.getType());
-                boolean isNeedCheckTakeOver = !Arrays.asList(JobAction.CHECK.getValue(), JobAction.TAKE_OVER.getValue()).contains(jobVo.getAction());
-                autoexecJobSourceActionHandler.executeAuthCheck(jobVo, isNeedCheckTakeOver);
+                autoexecJobSourceActionHandler.executeAuthCheck(jobVo);
             }
         }
         return myValidate(jobVo);
diff --git a/src/main/java/neatlogic/framework/autoexec/job/source/type/AutoexecJobSourceTypeHandlerBase.java b/src/main/java/neatlogic/framework/autoexec/job/source/type/AutoexecJobSourceTypeHandlerBase.java
index 25352a69b8da0194a3854100f6bea0e58314f0e2..921716057ee3a70d4649b28d08d49351ee75fa56 100644
--- a/src/main/java/neatlogic/framework/autoexec/job/source/type/AutoexecJobSourceTypeHandlerBase.java
+++ b/src/main/java/neatlogic/framework/autoexec/job/source/type/AutoexecJobSourceTypeHandlerBase.java
@@ -9,7 +9,6 @@ import neatlogic.framework.autoexec.exception.AutoexecJobExecutePermissionDenied
 import neatlogic.framework.dao.mapper.UserMapper;
 import neatlogic.framework.dto.UserVo;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,32 +48,31 @@ public abstract class AutoexecJobSourceTypeHandlerBase implements IAutoexecJobSo
 
 
     @Override
-    public void executeAuthCheck(AutoexecJobVo jobParam, boolean isNeedCheckTakeOver) {
+    public void executeAuthCheck(AutoexecJobVo jobParam) {
         Long jobId = jobParam.getId();
-        String execUser = StringUtils.isNotBlank(jobParam.getAssignExecUser()) ? jobParam.getAssignExecUser() : UserContext.get().getUserUuid(true);
+        String execUser = UserContext.get().getUserUuid(true);
         jobParam.setExecUser(execUser);
-        if (isNeedCheckTakeOver) {
-            AutoexecJobVo originJob = autoexecJobMapper.getJobInfo(jobId);
-            //作业存在 且 执行人不相等，则需要先接管作业
-            if (originJob != null && !execUser.equals(originJob.getExecUser())) {
-                //是否需要替换execUser
-                if (jobParam.getIsTakeOver() == 1) {
-                    autoexecJobMapper.updateJobExecUser(jobId, jobParam.getExecUser());
-                } else {
-                    List<UserVo> userVos = userMapper.getUserByUserUuidList(Arrays.asList(execUser, originJob.getExecUser()));
-                    String currentUserName = execUser;
-                    String originUserName = originJob.getExecUser();
-                    if (CollectionUtils.isNotEmpty(userVos)) {
-                        for (UserVo userVo : userVos) {
-                            if (Objects.equals(userVo.getUuid(), currentUserName)) {
-                                currentUserName = userVo.getName() + "(" + userVo.getUserId() + ")";
-                            } else if (Objects.equals(userVo.getUuid(), originUserName)) {
-                                originUserName = userVo.getName() + "(" + userVo.getUserId() + ")";
-                            }
+        //来源功能不一定会带source和parentId,则这里补一下已存在的作业这两个信息
+        AutoexecJobVo originJob = autoexecJobMapper.getJobInfoWithInvoke(jobId);
+        //不为空代表不是新建作业
+        if (originJob != null) {
+            jobParam.setSource(originJob.getSource());
+            jobParam.setParentId(originJob.getParentId());
+            autoexecTakeOver(originJob);
+            if (!execUser.equals(originJob.getExecUser())) {
+                List<UserVo> userVos = userMapper.getUserByUserUuidList(Arrays.asList(execUser, originJob.getExecUser()));
+                String currentUserName = execUser;
+                String originUserName = originJob.getExecUser();
+                if (CollectionUtils.isNotEmpty(userVos)) {
+                    for (UserVo userVo : userVos) {
+                        if (Objects.equals(userVo.getUuid(), currentUserName)) {
+                            currentUserName = userVo.getName() + "(" + userVo.getUserId() + ")";
+                        } else if (Objects.equals(userVo.getUuid(), originUserName)) {
+                            originUserName = userVo.getName() + "(" + userVo.getUserId() + ")";
                         }
                     }
-                    throw new AutoexecJobExecutePermissionDeniedException(jobId, currentUserName, originUserName);
                 }
+                throw new AutoexecJobExecutePermissionDeniedException(jobId, currentUserName, originUserName);
             }
         }
         myExecuteAuthCheck(jobParam);
@@ -85,7 +83,8 @@ public abstract class AutoexecJobSourceTypeHandlerBase implements IAutoexecJobSo
 
 
     @Override
-    public void overrideProfile(AutoexecJobVo autoexecJobVo, Map<String, AutoexecParamVo> autoexecProfileParamVoMap, Long profileId) {
+    public void overrideProfile(AutoexecJobVo
+                                        autoexecJobVo, Map<String, AutoexecParamVo> autoexecProfileParamVoMap, Long profileId) {
 
     }
 
diff --git a/src/main/java/neatlogic/framework/autoexec/job/source/type/IAutoexecJobSourceTypeHandler.java b/src/main/java/neatlogic/framework/autoexec/job/source/type/IAutoexecJobSourceTypeHandler.java
index 4932523eb0ace323660d212d0b0e277db351c3f4..cabf01d41767d4ebdb0c87e807a2bcd8488e52fa 100644
--- a/src/main/java/neatlogic/framework/autoexec/job/source/type/IAutoexecJobSourceTypeHandler.java
+++ b/src/main/java/neatlogic/framework/autoexec/job/source/type/IAutoexecJobSourceTypeHandler.java
@@ -192,7 +192,7 @@ public interface IAutoexecJobSourceTypeHandler {
      *
      * @param jobVo 作业
      */
-    void executeAuthCheck(AutoexecJobVo jobVo, boolean isNeedCheckTakeOver);
+    void executeAuthCheck(AutoexecJobVo jobVo);
 
     /**
      * 获取对应管理员权限
@@ -321,4 +321,10 @@ public interface IAutoexecJobSourceTypeHandler {
      */
     default void addExtraJobPhaseNodeBlueGreenInfoByList(Long jobId, List<AutoexecJobPhaseNodeVo> jobPhaseNodeVoList) {
     }
+
+    /**
+     * 自动接管，目前用于批量流水线
+     */
+    default void autoexecTakeOver(AutoexecJobVo jobVo){
+    }
 }