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