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 21682604..fa930fd1 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 @@ -105,7 +105,7 @@ public class EssService { BizAssertions.assertTrue(essPerson.isAuthorized(), "人员未加入单位, 无法授权"); EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId()); essClient.addSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealPerson); - orgManager.maybeAddPersonAndSealAuthorization(request.getEssSealId(), request.getPersonId(), + orgManager.maybeAddPersonAndSetSealAuthorized(request.getEssSealId(), request.getPersonId(), request.getOperatorPersonId()); } 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 8cf5e8cc..c5f88f0c 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 @@ -138,11 +138,11 @@ public class OrgManager { } @BizTransactional - public void maybeAddPersonAndSealAuthorization(String essSealId, Long personId, Long authorizedByPersonId) { + public void maybeAddPersonAndSetSealAuthorized(String essSealId, Long personId, Long authorizedByPersonId) { maybeAddSealPerson(essSealId, personId); essSealPersonDao.setPersonAuthorized(essSealId, personId, authorizedByPersonId); String subject = idbuilder().append(essSealId).append(personId).build(); - essLogDao.log("addSealAuthorization", subject, "personId", personId, "authorizedBy", authorizedByPersonId); + essLogDao.log("maybeAddPersonAndSetSealAuthorized", subject, "personId", personId, "authorizedBy", authorizedByPersonId); log.info("add seal authorization: essSealId={}, personId={}, authorizedByPersonId={}", essSealId, personId, authorizedByPersonId); } 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 9ab1aa8b..6c133ed1 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 @@ -125,7 +125,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { EssSealType.fromEssCode(operate.getSealType())); // 1. 印章创建人会自动获得授权; 2. 避免miss create事件 if (sealCreated) - orgManager.maybeAddPersonAndSealAuthorization(operate.getSealId(), operator.getPersonId(), + orgManager.maybeAddPersonAndSetSealAuthorized(operate.getSealId(), operator.getPersonId(), operator.getPersonId()); if ("Delete".equals(operate.getOperate())) orgManager.updateSealState(operate.getSealId(), EssSealState.DELETED); @@ -140,7 +140,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { // 可能从控制台直接授权 boolean authorizedByPreset = savedPerson != null && savedPerson.getAuthorizedByPersonId() > 0; long authorizedByPersonId = authorizedByPreset ? 0L : operator.getPersonId(); - orgManager.maybeAddPersonAndSealAuthorization(operate.getSealId(), authorized.getPersonId(), + orgManager.maybeAddPersonAndSetSealAuthorized(operate.getSealId(), authorized.getPersonId(), authorizedByPersonId); } if ("Invalid".equals(operate.getOperate()))