From 2621c6908586965d8cc022518afb8d1d2cca0b12 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 7 Jul 2026 11:07:02 +0800 Subject: [PATCH] fix bug orgId not send --- .../adapter/web/OrgDepartmentController.java | 9 +------- .../web/QualFilingChangeController.java | 4 ++-- .../app/executor/OrgDepartmentExecutor.java | 3 ++- .../app/executor/OrgEquipmentExecutor.java | 3 ++- .../executor/OrgPersonnelCertExecutor.java | 3 ++- .../executor/OrgPersonnelChangeExecutor.java | 3 ++- .../app/executor/OrgPersonnelExecutor.java | 3 ++- .../app/executor/OrgPositionExecutor.java | 3 ++- .../executor/OrgQualificationExecutor.java | 3 ++- .../app/executor/OrgResignApplyExecutor.java | 3 ++- .../executor/QualFilingChangeExecutor.java | 8 +++---- .../adapter/ThreadLocalUserInfoAdapter.java | 17 ++++++++++++++ .../utils/RequestHandlerUtil.java | 22 ------------------- 13 files changed, 40 insertions(+), 44 deletions(-) delete mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java index 3ab71fd..9cc2159 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java @@ -1,18 +1,11 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgDepartmentApi; import org.qinan.safetyeval.client.co.OrgDepartmentCO; -import org.qinan.safetyeval.client.dto.OrgDepartmentAddCmd; -import org.qinan.safetyeval.client.dto.OrgDepartmentModifyCmd; -import org.qinan.safetyeval.client.dto.OrgDepartmentPageQuery; -import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; -import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserInfo; -import org.springframework.beans.factory.annotation.Autowired; +import org.qinan.safetyeval.client.dto.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index 2bf9e83..12a01db 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -9,7 +9,7 @@ import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingChangeOrgCO; import org.qinan.safetyeval.client.dto.*; -import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,7 +45,7 @@ public class QualFilingChangeController { @ApiOperation("分页查询备案变更-机构端") @GetMapping("/org/page") public PageResponse orgPage(@Validated QualFilingChangePageQuery query) { - Long orgId = RequestHandlerUtil.getOrgId(); + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); query.setOrgId(orgId); return qualFilingChangeApi.orgPage(query); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java index 0649998..0a1ce1e 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java @@ -11,6 +11,7 @@ import org.qinan.safetyeval.domain.entity.OrgDepartmentEntity; import org.qinan.safetyeval.domain.query.OrgDepartmentQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgDepartmentDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -75,7 +76,7 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setParentId(query.getParentId()); domainQuery.setDeptName(query.getDeptName()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java index df38fcb..657c01c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java @@ -11,6 +11,7 @@ import org.qinan.safetyeval.domain.entity.OrgEquipmentEntity; import org.qinan.safetyeval.domain.query.OrgEquipmentQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgEquipmentDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -95,7 +96,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setDeviceName(query.getDeviceName()); domainQuery.setInstrumentType(query.getInstrumentType()); domainQuery.setDeviceType(query.getDeviceType()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java index 3ebe1b0..e55aa37 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java @@ -11,6 +11,7 @@ import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity; import org.qinan.safetyeval.domain.query.OrgPersonnelCertQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgPersonnelCertDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -91,7 +92,7 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setCertName(query.getCertName()); domainQuery.setCertTypeCode(query.getCertTypeCode()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelChangeExecutor.java index 17e39ca..69c9f76 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelChangeExecutor.java @@ -11,6 +11,7 @@ import org.qinan.safetyeval.domain.entity.OrgPersonnelChangeEntity; import org.qinan.safetyeval.domain.query.OrgPersonnelChangeQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgPersonnelChangeDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -74,7 +75,7 @@ public class OrgPersonnelChangeExecutor implements OrgPersonnelChangeApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setChangeItem(query.getChangeItem()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index abdcbea..b28677d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -4,6 +4,7 @@ import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.FacadeUserAddCmd; import com.jjb.saas.system.client.user.request.UserAddCmd; import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.zcloud.gbscommon.utils.MD5; @@ -135,7 +136,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setDeptId(query.getDeptId()); domainQuery.setPostId(query.getPostId()); domainQuery.setUserName(query.getUserName()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java index 3b67985..6b3d422 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java @@ -11,6 +11,7 @@ import org.qinan.safetyeval.domain.entity.OrgPositionEntity; import org.qinan.safetyeval.domain.query.OrgPositionQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgPositionDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -71,7 +72,7 @@ public class OrgPositionExecutor implements OrgPositionApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setDeptId(query.getDeptId()); domainQuery.setPositionName(query.getPositionName()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java index a84baab..3b7f2b7 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java @@ -12,6 +12,7 @@ import org.qinan.safetyeval.domain.entity.OrgQualificationEntity; import org.qinan.safetyeval.domain.query.OrgQualificationQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgQualificationDomainService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -90,7 +91,7 @@ public class OrgQualificationExecutor implements OrgQualificationApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setCertName(query.getCertName()); domainQuery.setCertNo(query.getCertNo()); domainQuery.setEnableFlag(query.getEnableFlag()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java index 9257220..9165449 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java @@ -14,6 +14,7 @@ import org.qinan.safetyeval.domain.query.OrgResignApplyQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgResignApplyDomainService; import org.qinan.safetyeval.app.support.OrgPersonnelViewEnricher; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -105,7 +106,7 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setAuditStatusCode(query.getAuditStatusCode()); domainQuery.setApplicantName(query.getApplicantName()); 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 241348a..3525382 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 @@ -23,9 +23,9 @@ import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService; import org.qinan.safetyeval.domain.service.QualFilingDomainService; 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 org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; @@ -172,7 +172,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); PageResult pageResult = qualFilingChangeDomainService.page(domainQuery); @@ -186,7 +186,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { QualFilingChangeQuery domainQuery = new QualFilingChangeQuery(); domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); - domainQuery.setOrgId(query.getOrgId()); + domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); @@ -236,7 +236,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 变更基本信息 QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd()); - entity.setOrgId(RequestHandlerUtil.getOrgId()); + entity.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); // 变更承诺书 QualFilingCommitmentChangeE commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertCmdToE(cmd.getQualFilingCommitmentChangeAddCmd()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java index fe43073..4e0cbf2 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java @@ -1,6 +1,10 @@ package org.qinan.safetyeval.infrastructure.adapter; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + /** * 基于 ThreadLocal 的用户信息适配器默认实现 *

@@ -32,4 +36,17 @@ public class ThreadLocalUserInfoAdapter { public static void clear() { ORG_ID.remove(); } + + + + /** + * holder + * + * @return String + */ + public static Long getOrgId() { + String orgInfoId = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()).getRequest().getHeader("orgInfoId"); + return StringUtils.isBlank(orgInfoId) ? null : Long.valueOf(orgInfoId); + } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java deleted file mode 100644 index db8056e..0000000 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.qinan.safetyeval.infrastructure.utils; - -import lombok.experimental.UtilityClass; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -@UtilityClass -public class RequestHandlerUtil { - - - /** - * holder - * - * @return String - */ - public static Long getOrgId() { - String orgInfoId = ((ServletRequestAttributes) RequestContextHolder - .getRequestAttributes()).getRequest().getHeader("orgInfoId"); - return StringUtils.isBlank(orgInfoId) ? null : Long.valueOf(orgInfoId); - } -}