diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index 347c7099..e1d871f4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -139,9 +139,9 @@ public class PipelineServiceImpl extends ServiceImpl i pipStage.setCreateTime(LocalDateTime.now()); pipStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); if (o.isCode()){ - pipStage.setCode(false); - }else { pipStage.setCode(true); + }else { + pipStage.setCode(false); } pipStageList.add(pipStage); @@ -158,9 +158,9 @@ public class PipelineServiceImpl extends ServiceImpl i childStage.setCreateTime(LocalDateTime.now()); childStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); if (j.isCode()){ - childStage.setCode(false); - }else { childStage.setCode(true); + }else { + childStage.setCode(false); } pipStageList.add(childStage); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 0ab6d080..bc87b29e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -403,7 +403,10 @@ public class StageServiceImpl extends ServiceImpl impleme updateList.add(stage); } } - stageDao.updateBatch(updateList); + //如果删除的为最后一个新增阶段,则无需更新前面阶段的sort值 + if (!CollectionUtils.isEmpty(updateList)){ + stageDao.updateBatch(updateList); + } stageDao.deleteById(stageId); }