From bfcd95d00aeaaa0108f74f386cc80fe57a977e79 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Wed, 26 Feb 2025 15:52:29 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=B0=83=E6=95=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java  | 9 +++++++++
 .../nanopart/ess/server/ess/domain/PersonOpenId.java     | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

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();