From 9d6dfdbe16d00a1b53065819f454d14181a1117b Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Thu, 29 May 2025 16:36:55 +0800 Subject: [PATCH 1/2] 0529 ljc --- .../service/pipeline/impl/PipelineServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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); From 952d863a611e4cc6b51aac766981f3b38fbb521d Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Fri, 30 May 2025 11:39:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?0529=20ljc=20=20=E4=BF=AE=E6=94=B9=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=98=B6=E6=AE=B5npe=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/process/service/stage/impl/StageServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); }