From b72722368e003ccb79e8f7d7d931f8fba4214842 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Mon, 3 Mar 2025 14:31:34 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E7=94=A8=E6=88=B7=E7=A6=BB?=
 =?UTF-8?q?=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nanopart/ess/server/dao/EssPersonDao.java | 22 ++++++++++---------
 .../ess/server/dao/EssSealPersonDao.java      |  8 +++++++
 .../nanopart/ess/server/ess/OrgManager.java   |  1 +
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java
index 28c1ec5b..213044ef 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java
@@ -1,19 +1,21 @@
 
 package cn.axzo.nanopart.ess.server.dao;
 
-import cn.axzo.nanopart.ess.api.domain.OrgPerson;
-import cn.axzo.nanopart.ess.api.enums.EssPersonState;
-import cn.axzo.nanopart.ess.server.entity.EssPerson;
-import cn.axzo.nanopart.ess.server.mapper.EssPersonMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Repository;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import cn.axzo.nanopart.ess.api.domain.OrgPerson;
+import cn.axzo.nanopart.ess.api.enums.EssPersonState;
+import cn.axzo.nanopart.ess.server.entity.EssPerson;
+import cn.axzo.nanopart.ess.server.mapper.EssPersonMapper;
+
 /**
  * @author yanglin
  */
@@ -40,10 +42,10 @@ public class EssPersonDao extends ServiceImpl<EssPersonMapper, EssPerson> {
 				.oneOpt();
 	}
 
-	public void setOrgPersonState(EssPerson person, EssPersonState state) {
+	public void setOrgPersonState(OrgPerson person, EssPersonState state) {
 		lambdaUpdate() //
 				.eq(EssPerson::getOuId, person.getOuId()) //
-				.eq(EssPerson::getId, person.getId()) //
+				.eq(EssPerson::getPersonId, person.getPersonId()) //
 				.set(EssPerson::getState, state) //
 				.update();
 	}
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java
index 90ec54e0..3ad96f15 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import cn.axzo.nanopart.ess.api.domain.OrgPerson;
 import cn.axzo.nanopart.ess.api.utils.YesOrNo;
 import cn.axzo.nanopart.ess.server.entity.EssSealPerson;
 import cn.axzo.nanopart.ess.server.mapper.EssSealPersonMapper;
@@ -64,4 +65,11 @@ public class EssSealPersonDao extends ServiceImpl<EssSealPersonMapper, EssSealPe
 				.list();
 	}
 
+	public void deleteByPersonIds(OrgPerson person) {
+		lambdaUpdate()
+				.eq(EssSealPerson::getOuId, person.getOuId())
+				.eq(EssSealPerson::getPersonId, person.getPersonId())
+				.remove();
+	}
+
 }
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 8473a22e..97a8c358 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
@@ -203,6 +203,7 @@ public class OrgManager {
 
 	public void setOrgPersonResign(EssPerson person) {
 		essPersonDao.setOrgPersonState(person, EssPersonState.RESIGNED);
+		essSealPersonDao.deleteByPersonIds(person);
 		log.info("set person resigned: {}", person);
 	}