diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index 3525382..b97e246 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -1,13 +1,11 @@ package org.qinan.safetyeval.app.executor; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.app.change.convertor.*; import org.qinan.safetyeval.app.orchestrator.QualFilingOrchestrator; import org.qinan.safetyeval.client.api.QualFilingChangeApi; -import org.qinan.safetyeval.client.co.QualFilingChangeAggregationCO; -import org.qinan.safetyeval.client.co.QualFilingChangeCO; -import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; -import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO; -import org.qinan.safetyeval.client.co.QualFilingChangeOrgCO; +import org.qinan.safetyeval.client.co.*; import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.domain.change.gateway.*; import org.qinan.safetyeval.domain.change.model.*; @@ -26,8 +24,6 @@ import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.qinan.safetyeval.infrastructure.mapper.QualFilingChangeMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -236,7 +232,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 变更基本信息 QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd()); - entity.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + entity.setOrgId(ThreadLocalUserInfoAdapter.getOrgId() == null ? entity.getOrgId() : ThreadLocalUserInfoAdapter.getOrgId()); // 变更承诺书 QualFilingCommitmentChangeE commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertCmdToE(cmd.getQualFilingCommitmentChangeAddCmd());