From e5352ae6c795f1092c147bb30a9cc71361c02d77 Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 4 Mar 2025 16:39:29 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E6=8E=88=E6=9D=83=E4=BA=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/nanopart/ess/server/ess/EssService.java | 5 +++-- .../ess/server/ess/controller/CallbackController.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index 9a90457c..dd2ee6fa 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -95,8 +95,9 @@ public class EssService { EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId()); essClient.addSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealPerson); orgManager.maybeAddPersonAndSetSealAuthorized(request.getEssSealId(), request.getPersonId()); - orgManager.setSealPersonAuthorizedBy(request.getEssSealId(), request.getPersonId(), - request.getOperatorPersonId()); + Long operatorPersonId = request.getOperatorPersonId(); + if (operatorPersonId != null && operatorPersonId > 0) + orgManager.setSealPersonAuthorizedBy(request.getEssSealId(), request.getPersonId(), operatorPersonId); } @BizTransactional diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java index c6ac759c..717e2a3e 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java @@ -95,7 +95,8 @@ class CallbackController implements EssCallbackApi, InitializingBean { AddSealAuthorizationRequest addSealAuthorizationRequest = new AddSealAuthorizationRequest(); addSealAuthorizationRequest.setEssSealId(sealPerson.getEssSealId()); addSealAuthorizationRequest.setPersonId(person.getPersonId()); - addSealAuthorizationRequest.setOperatorPersonId(person.getPersonId()); + // 保留界面上的授权人 + addSealAuthorizationRequest.setOperatorPersonId(0L); try { essService.essAddSealAuthorization(addSealAuthorizationRequest); }