diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java index 404dfc7b..5dada51d 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java @@ -24,4 +24,9 @@ public interface OrgPerson { static boolean equals(OrgPerson a, OrgPerson b) { return Objects.equals(a.getOuId(), b.getOuId()) && Objects.equals(a.getPersonId(), b.getPersonId()); } + + static String toString(OrgPerson person) { + return String.format("%d_%d", person.getOuId(), person.getPersonId()); + } + } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java index 4be7265f..c02e488b 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java @@ -53,10 +53,10 @@ public class EssOrgDao extends ServiceImpl { .update(); } - public void changeSuperAdmin(Long ouId, Long personId) { + public void changeSuperAdmin(OrgPerson admin) { lambdaUpdate() // - .eq(EssOrg::getOuId, ouId) // - .set(EssOrg::getSuperAdminPersonId, personId) // + .eq(EssOrg::getOuId, admin.getOuId()) // + .set(EssOrg::getSuperAdminPersonId, admin.getPersonId()) // .update(); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java index 39c4c5cc..0b13ff9a 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java @@ -57,10 +57,10 @@ public class EssSealPersonDao extends ServiceImpl getByPersonId(Long ouId, Long personId) { + public List getByPerson(OrgPerson person) { return lambdaQuery() // - .eq(EssSealPerson::getOuId, ouId) // - .eq(EssSealPerson::getPersonId, personId) // + .eq(EssSealPerson::getOuId, person.getOuId()) // + .eq(EssSealPerson::getPersonId, person.getPersonId()) // .list(); } 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 16ba04d4..2663a3ab 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 @@ -93,9 +93,9 @@ public class OrgManager { } @BizTransactional - public void changeSuperAdmin(Long ouId, Long superAdmin) { - essOrgDao.changeSuperAdmin(ouId, superAdmin); - log.info("change super admin: ouId={}, superAdmin={}", ouId, superAdmin); + public void changeSuperAdmin(OrgPerson admin) { + essOrgDao.changeSuperAdmin(admin); + log.info("change super admin: {}", OrgPerson.toString(admin)); } public EssPerson getSuperAdminOrThrow(Long ouId) { 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 27f58de6..c6ac759c 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 @@ -91,7 +91,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { PersonOpenId person = PersonOpenId.parse(request.readMsgData(OrgPersonJoin.class).getProxyOperatorOpenId()); orgManager.addAuthorizedOrgPerson(person); // 自动授权 - for (EssSealPerson sealPerson : essSealPersonDao.getByPersonId(person.getOuId(), person.getPersonId())) { + for (EssSealPerson sealPerson : essSealPersonDao.getByPerson(person)) { AddSealAuthorizationRequest addSealAuthorizationRequest = new AddSealAuthorizationRequest(); addSealAuthorizationRequest.setEssSealId(sealPerson.getEssSealId()); addSealAuthorizationRequest.setPersonId(person.getPersonId()); @@ -201,7 +201,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { registerHandler(CallbackType.SUPER_ADMIN_CHANGED, request -> { SuperAdminChanged changes = request.readMsgData(SuperAdminChanged.class); PersonOpenId admin = PersonOpenId.parse(changes.getChangeToUserOpenId()); - orgManager.changeSuperAdmin(admin.getOuId(), admin.getPersonId()); + orgManager.changeSuperAdmin(admin); return admin.getOuId(); }); }