mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

Browse Source
This commit is contained in:
even 2025-05-30 11:40:23 +08:00
commit 00a172715f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
View File

@ -139,9 +139,9 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
pipStage.setCreateTime(LocalDateTime.now()); pipStage.setCreateTime(LocalDateTime.now());
pipStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); pipStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
if (o.isCode()){ if (o.isCode()){
pipStage.setCode(false);
}else {
pipStage.setCode(true); pipStage.setCode(true);
}else {
pipStage.setCode(false);
} }
pipStageList.add(pipStage); pipStageList.add(pipStage);
@ -158,9 +158,9 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
childStage.setCreateTime(LocalDateTime.now()); childStage.setCreateTime(LocalDateTime.now());
childStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId())); childStage.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
if (j.isCode()){ if (j.isCode()){
childStage.setCode(false);
}else {
childStage.setCode(true); childStage.setCode(true);
}else {
childStage.setCode(false);
} }
pipStageList.add(childStage); pipStageList.add(childStage);

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java
View File

@ -403,7 +403,10 @@ public class StageServiceImpl extends ServiceImpl<PipStageDao, PipStage> impleme
updateList.add(stage); updateList.add(stage);
} }
} }
//如果删除的为最后一个新增阶段，则无需更新前面阶段的sort值
if (!CollectionUtils.isEmpty(updateList)){
stageDao.updateBatch(updateList); stageDao.updateBatch(updateList);
}
stageDao.deleteById(stageId); stageDao.deleteById(stageId);
} }