REQ-2010: fix bugs

This commit is contained in:
yanglin 2024-02-27 13:35:13 +08:00
parent 121335d251
commit f9d88918ed

View File

@ -927,11 +927,11 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
private void buildPersonInfo(PendingMessageRecord record, PersonDTO promoter, PersonDTO executor, Long workspaceId) { private void buildPersonInfo(PendingMessageRecord record, PersonDTO promoter, PersonDTO executor, Long workspaceId) {
IdentityDTO promoterIdentity = promoter.getIdentity(); IdentityDTO promoterIdentity = promoter.getIdentity();
IdentityDTO executorIdentity = executor.getIdentity(); IdentityDTO executorIdentity = executor.getIdentity();
record.setPromoterId(promoterIdentity == null ? 0 : promoterIdentity.getId()); record.setPromoterId(promoterIdentity == null || promoterIdentity.getId() == null ? 0 : promoterIdentity.getId());
record.setPromoterType(promoterIdentity == null ? IdentityTypeEnum.NOT_SUPPORT : promoterIdentity.getType()); record.setPromoterType(promoterIdentity == null ? IdentityTypeEnum.NOT_SUPPORT : promoterIdentity.getType());
record.setPromoterPersonId(promoter.getId()); record.setPromoterPersonId(promoter.getId());
record.setPromoterName(promoter.getName()); record.setPromoterName(promoter.getName());
record.setExecutorId(executorIdentity == null ? 0 : executorIdentity.getId()); record.setExecutorId(executorIdentity == null || executorIdentity.getId() == null ? 0 : executorIdentity.getId());
record.setExecutorType(executorIdentity == null ? IdentityTypeEnum.NOT_SUPPORT : executorIdentity.getType()); record.setExecutorType(executorIdentity == null ? IdentityTypeEnum.NOT_SUPPORT : executorIdentity.getType());
record.setExecutorPersonId(executor.getId()); record.setExecutorPersonId(executor.getId());
record.setExecutorName(executor.getName()); record.setExecutorName(executor.getName());