diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java index 7d336e44..c9924261 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java @@ -138,4 +138,5 @@ public class PipPipeline extends PipBaseElement { * 机器id * */ private String machineId; + private Long tenantId; } 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 0f32472b..b96c9568 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 @@ -109,7 +109,8 @@ public class PipelineServiceImpl extends ServiceImpl i List pipTaskList = new ArrayList<>(0); PipPipeline pipeline = pipelineConverter.reqToDO(pipelineReq); - + Long tenantId = WebFrameworkUtils.getLoginUser().getTenantId(); + pipeline.setTenantId(tenantId); // 随机颜色 int randomNumber = (int)(Math.random() * 5) + 1; pipeline.setColor(randomNumber); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java index 6b157d74..1640c94b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java @@ -40,6 +40,14 @@ public class WebFrameworkUtils { return null; } } + public static LoginUser getLoginUser() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + return (LoginUser) authentication.getPrincipal(); + } catch (Exception e){ + return null; + } + } public static String getLoginUserIdStr(){ Long loginUserId = getLoginUserId(); if (loginUserId!=null) {