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 bd3841d7..55258f71 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 @@ -1,5 +1,7 @@ package cn.axzo.nanopart.ess.api.domain; +import cn.axzo.nanopart.ess.api.domain.contract.OrgPersonInfo; + import java.util.Objects; /** @@ -11,6 +13,13 @@ public interface OrgPerson { Long getPersonId(); + default OrgPersonInfo toOrgPersonInfo() { + OrgPersonInfo orgPersonInfo = new OrgPersonInfo(); + orgPersonInfo.setOuId(getOuId()); + orgPersonInfo.setPersonId(getPersonId()); + return orgPersonInfo; + } + static boolean equals(OrgPerson a, OrgPerson b) { return Objects.equals(a.getOuId(), b.getOuId()) && Objects.equals(a.getPersonId(), b.getPersonId()); diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/PersonOpenId.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/PersonOpenId.java index ae616e61..da58d155 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/PersonOpenId.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/PersonOpenId.java @@ -1,7 +1,6 @@ package cn.axzo.nanopart.ess.server.ess.domain; import cn.axzo.nanopart.ess.api.domain.OrgPerson; -import cn.axzo.nanopart.ess.api.domain.contract.OrgPersonInfo; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -39,13 +38,6 @@ public class PersonOpenId implements OrgPerson { return ouId + "_" + personId; } - public OrgPersonInfo toOrgPersonInfo() { - OrgPersonInfo orgPersonInfo = new OrgPersonInfo(); - orgPersonInfo.setOuId(ouId); - orgPersonInfo.setPersonId(personId); - return orgPersonInfo; - } - @Override public String toString() { return toOpenId();