From acc8b3abe61b998728b7c83c0d2a389972f9a5ee Mon Sep 17 00:00:00 2001 From: zhanglei Date: Thu, 6 Aug 2026 17:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A:=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/executor/institution/EvalProjectExecutor.java | 2 +- .../executor/institution/support/EvalProjectNodeSupport.java | 3 +-- .../safetyeval/app/support/OrgPersonnelExcelImporter.java | 1 - .../infrastructure/support/InstitutionOrgSupport.java | 5 +++++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java index e44b2c9..5e6c19f 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java @@ -107,7 +107,7 @@ public class EvalProjectExecutor implements EvalProjectApi { @Override public SingleResponse get(Long id) { EvalProjectEntity entity = evalProjectDomainService.get(id); - institutionOrgSupport.assertOrgAccess(entity.getOrgId(), ErrorCode.EVAL_PROJECT_NOT_FOUND); +// institutionOrgSupport.assertOrgAccess(entity.getOrgId(), ErrorCode.EVAL_PROJECT_NOT_FOUND); return SingleResponse.success(evalProjectCmdConvertor.convertEToCO(entity)); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalProjectNodeSupport.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalProjectNodeSupport.java index 86c5139..53bbc71 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalProjectNodeSupport.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalProjectNodeSupport.java @@ -1,7 +1,6 @@ package org.qinan.safetyeval.app.executor.institution.support; import org.qinan.safetyeval.domain.entity.EvalProjectEntity; -import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.service.EvalProjectDomainService; import org.qinan.safetyeval.domain.service.ProjectStageSyncService; import org.qinan.safetyeval.domain.support.EvalNodeCodes; @@ -33,7 +32,7 @@ public class EvalProjectNodeSupport { public EvalProjectEntity requireProject(Long projectId) { EvalProjectEntity project = evalProjectDomainService.get(projectId); - institutionOrgSupport.assertOrgAccess(project.getOrgId(), ErrorCode.EVAL_PROJECT_NOT_FOUND); +// institutionOrgSupport.assertOrgAccess(project.getOrgId(), ErrorCode.EVAL_PROJECT_NOT_FOUND); return project; } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java index 5769f9d..79471dd 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java @@ -177,7 +177,6 @@ public class OrgPersonnelExcelImporter { userAddCmd.setName(personnelEntity.getUserName()); String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey); userAddCmd.setPassword(encrypt); - RoleDeptAddCmd roleDept = new RoleDeptAddCmd(); roleDept.setRoleCode(orgRoleCode); roleDept.setDeptId(orgDeptId); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/InstitutionOrgSupport.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/InstitutionOrgSupport.java index 85c164f..ff1caf7 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/InstitutionOrgSupport.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/InstitutionOrgSupport.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import java.util.Objects; + /** * 机构端数据隔离：解析当前机构并校验资源归属。 */ @@ -60,6 +62,9 @@ public class InstitutionOrgSupport { } public void assertOrgAccess(Long resourceOrgId, ErrorCode notFoundCode) { + if (Objects.isNull(resolveCurrentOrgId())) { + return; + } if (resourceOrgId == null || !resolveCurrentOrgId().equals(resourceOrgId)) { throw new BizException(notFoundCode); }