From ef59830bc6058cec7aee59155672c5a8115f60a5 Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 25 Feb 2025 18:43:55 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=A4=84=E7=90=86=E5=8D=B0?= =?UTF-8?q?=E7=AB=A0=E7=9B=B4=E6=8E=A5=E4=BB=8E=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/nanopart/ess/server/ess/QueryService.java | 2 +- .../ess/server/ess/controller/CallbackController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java index b6785ea2..cee6018f 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java @@ -166,7 +166,7 @@ public class QueryService { ? null : sealPerson.getAuthorizeTime().getTime()); PersonProfileDto person = personProfiles.findOrNull(sealPerson.getPersonId()); sealPersonInfo.setPersonName(person == null ? "" : person.getRealName()); - PersonProfileDto authorizedBy = personProfiles.findOrNull(sealPerson.getPersonId()); + PersonProfileDto authorizedBy = personProfiles.findOrNull(sealPerson.getAuthorizedByPersonId()); sealPersonInfo.setAuthorizedByPersonName(authorizedBy == null ? "" : authorizedBy.getRealName()); sealPersonsInfo.add(sealPersonInfo); } 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 ee4f66cd..519f2867 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 @@ -124,8 +124,8 @@ class CallbackController implements EssCallbackApi, InitializingBean { .find(operate.getSealId(), authorized.getPersonId()) .orElse(null); // 可能从控制台直接授权 - boolean authorizedByPersonPreset = savedPerson != null && savedPerson.getAuthorizedByPersonId() > 0; - long authorizedByPersonId = authorizedByPersonPreset ? 0L : operator.getPersonId(); + boolean authorizedByPreset = savedPerson != null && savedPerson.getAuthorizedByPersonId() > 0; + long authorizedByPersonId = authorizedByPreset ? 0L : operator.getPersonId(); orgManager.addSealAuthorization(operate.getSealId(), authorized.getPersonId(), authorizedByPersonId); } if ("Invalid".equals(operate.getOperate()))