From feb3a427a90dac10ff859717af70054ef209074f Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 13 Feb 2025 18:17:29 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.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/OrgManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java index d3313b3b..822dc664 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java @@ -61,7 +61,7 @@ public class OrgManager { // !! org and person @Transactional - public void maybeCreateOrgPersonAndSetAuthorized(Long ouId, Long personId) { + public void addAuthorizedOrgPerson(Long ouId, Long personId) { EssPerson person = getOrCreateOrgPerson(ouId, personId); essPersonDao.setAuthorized(person); } 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 14456fd9..7a1cfdaa 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 @@ -68,7 +68,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { OrgAuthorizationFinish result = request.readMsgData(OrgAuthorizationFinish.class); PersonOpenId person = PersonOpenId.parse(result.getProxyOperatorOpenId()); if (result.isOpenSuccess()) { - orgManager.maybeCreateOrgPersonAndSetAuthorized(person.getOuId(), person.getPersonId()); + orgManager.addAuthorizedOrgPerson(person.getOuId(), person.getPersonId()); orgManager.setOrgAuthorized(person.getOuId(), person.getPersonId()); } return IdBuilder.builder() @@ -78,7 +78,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { // 员工加入子企业的时候发送此通知 registerHandler(CallbackType.ORG_PERSON_JOIN, request -> { PersonOpenId person = PersonOpenId.parse(request.readMsgData(OrgPersonJoin.class).getProxyOperatorOpenId()); - orgManager.maybeCreateOrgPersonAndSetAuthorized(person.getOuId(), person.getPersonId()); + orgManager.addAuthorizedOrgPerson(person.getOuId(), person.getPersonId()); // 一般情况下只会存在一条记录 for (EssSealPerson sealPerson : essSealPersonDao.getByPersonId(person.getPersonId())) { AddSealAuthorizationRequest addSealAuthorizationRequest = new AddSealAuthorizationRequest();