From d301061cb291bb3e5cbd4fc306984f7339f971ce Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 15 Jul 2026 14:53:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qinan/safetyeval/app/executor/OrgDepartmentExecutor.java | 2 +- .../org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java | 2 +- .../qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java | 2 +- .../safetyeval/app/executor/OrgPersonnelChangeExecutor.java | 2 +- .../org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java | 2 +- .../org/qinan/safetyeval/app/executor/OrgPositionExecutor.java | 2 +- .../qinan/safetyeval/app/executor/OrgQualificationExecutor.java | 2 +- .../qinan/safetyeval/app/executor/OrgResignApplyExecutor.java | 2 +- .../qinan/safetyeval/app/executor/QualFilingChangeExecutor.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 d4e3c07..2da6204 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 @@ -95,7 +95,7 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId()); domainQuery.setDeptName(query.getDeptName()); PageResult pageResult = orgDepartmentDomainService.page(domainQuery); 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 657c01c..7185830 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 @@ -96,7 +96,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 a10abc3..24da97c 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 @@ -92,7 +92,7 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 69c9f76..def350c 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 @@ -75,7 +75,7 @@ public class OrgPersonnelChangeExecutor implements OrgPersonnelChangeApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 b2e156d..b60b7a3 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 @@ -136,7 +136,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 6b3d422..5e06fe9 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 @@ -72,7 +72,7 @@ public class OrgPositionExecutor implements OrgPositionApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 7187ed7..53343c4 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 @@ -91,7 +91,7 @@ public class OrgQualificationExecutor implements OrgQualificationApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 9165449..a51692f 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 @@ -106,7 +106,7 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.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 4cb95a8..b0dba38 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 @@ -186,7 +186,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { QualFilingChangeQuery domainQuery = new QualFilingChangeQuery(); domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());